Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Missing Translation Key on Reactions #10270

Merged
merged 4 commits into from
Apr 3, 2018
Merged

Conversation

bernardoetrevisan
Copy link
Contributor

@RocketChat/core

Closes #10158

This PR fixes a bug with translation on reactions. There was a key missing on the i18n file.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10270 March 29, 2018 18:16 Inactive
karlprieb
karlprieb previously approved these changes Mar 29, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10270 March 29, 2018 18:45 Inactive
@@ -1388,6 +1388,7 @@
"No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
"No_messages_yet": "No messages yet",
"No_pinned_messages": "No pinned messages",
"No_reactions": "No Reacting",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be "No Reactions"? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because "no reacting" sounds like reacting is not allowed..

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed unless I'm not understanding the context. This should for sure be "No Reactions"

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10270 March 30, 2018 03:46 Inactive
graywolf336
graywolf336 previously approved these changes Mar 30, 2018
Copy link
Contributor

@graywolf336 graywolf336 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated the translations and their strings to make more sense.

@geekgonecrazy
Copy link
Contributor

Why not: Allow Reacting? Or Disallow Reacting?

No reacting just doesn't sound right in this context

@graywolf336 graywolf336 added this to the 0.63.0 milestone Mar 30, 2018
@rodrigok rodrigok merged commit 39833fa into develop Apr 3, 2018
@rodrigok rodrigok deleted the fix-reactions-translation branch April 3, 2018 14:09
@rodrigok rodrigok mentioned this pull request Apr 4, 2018
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 6, 2018
* develop: (91 commits)
  [FIX] Audio Message UI fixes (RocketChat#10303)
  [NEW] Improve history generation (RocketChat#10319)
  Strip the colons when searching (RocketChat#10323)
  Bump snap version to include security fix (RocketChat#10313)
  Update Meteor to 1.6.1.1 (RocketChat#10314)
  [FIX] Unable to mention after newline in message (RocketChat#10078)
  [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224)
  [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163)
  Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258)
  [FIX] Missing Translation Key on Reactions (RocketChat#10270)
  Fix: inputs for rocketchat apps (RocketChat#10274)
  Fix: chat.react api not accepting previous emojis (RocketChat#10290)
  Fix: Scroll on content page (RocketChat#10300)
  [FIX] File had redirect delay when using external storage services and no option to proxy only avatars
  Add quotes in the endpoint deprecation warning
  Add deprecation warning to user.roles endpoint
  Improve pt-BR translations
  Fix caddy download link to pull from github
  Renaming channels.notifications Get/Post endpoints to subscriptions.getOne and rooms.saveNotifications
  Revert the removed endpoint, user.roles
  ...

# Conflicts:
#	package-lock.json
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 6, 2018
* goalify: (200 commits)
  Add S3 upload script
  Remove root-priviledged command
  switch gitlab ci config to use shell executor
  Try another build
  fix change language not reload
  temporary disable readonly
  [FIX] Audio Message UI fixes (RocketChat#10303)
  [NEW] Improve history generation (RocketChat#10319)
  Strip the colons when searching (RocketChat#10323)
  Bump snap version to include security fix (RocketChat#10313)
  Update Meteor to 1.6.1.1 (RocketChat#10314)
  [FIX] Unable to mention after newline in message (RocketChat#10078)
  [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224)
  [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163)
  Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258)
  [FIX] Missing Translation Key on Reactions (RocketChat#10270)
  Fix: inputs for rocketchat apps (RocketChat#10274)
  Fix: chat.react api not accepting previous emojis (RocketChat#10290)
  Fix: Scroll on content page (RocketChat#10300)
  change weather city to location
  ...

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-lib/server/functions/deleteUser.js
#	packages/rocketchat-theme/client/imports/components/main-content.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Allow reactions missing translation
6 participants