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] Translated and incorrect i18n variables #13463

Merged
merged 2 commits into from
Feb 13, 2019
Merged

[FIX] Translated and incorrect i18n variables #13463

merged 2 commits into from
Feb 13, 2019

Conversation

leonboot
Copy link
Contributor

  • [FIX] Removed trailing and leading spaces in variable names
  • [FIX] Aadded double underscores where only single underscores were used
  • [FIX] Updated some variable names which were translated as well

Closes #12892

I have not tested these changes, but looking at the changes, they're pretty straightforward and should be an improvement over the current i18n files. I may not have found all broken template variable references, but I've tried my best to find most of them using regexes.

* Removed trailing and leading spaces in variable names
* Aadded double underscores where only single underscores were used
* Updated some variable names which were translated as well
@CLAassistant
Copy link

CLAassistant commented Feb 13, 2019

CLA assistant check
All committers have signed the CLA.

@sampaiodiego sampaiodiego added this to the 0.74.3 milestone Feb 13, 2019
@sampaiodiego
Copy link
Member

awesome @leonboot .. thank you!

@sampaiodiego sampaiodiego changed the title Fixes #12892 [FIX] Translated and incorrect i18n variables Feb 13, 2019
@rodrigok rodrigok merged commit b48ffc4 into RocketChat:develop Feb 13, 2019
sampaiodiego pushed a commit that referenced this pull request Feb 14, 2019
* Fixes #12892

* Removed trailing and leading spaces in variable names
* Aadded double underscores where only single underscores were used
* Updated some variable names which were translated as well

* Fix __length__
@sampaiodiego sampaiodiego mentioned this pull request Feb 14, 2019
bhardwajaditya pushed a commit to bhardwajaditya/Rocket.Chat that referenced this pull request Mar 17, 2019
* Fixes RocketChat#12892

* Removed trailing and leading spaces in variable names
* Aadded double underscores where only single underscores were used
* Updated some variable names which were translated as well

* Fix __length__
wreiske added a commit to wreiske/Rocket.Chat that referenced this pull request Apr 28, 2019
…nto ldap-admin-groups

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (21 commits)
  Regression: Active room was not being marked (RocketChat#14276)
  Rename Cloud to Connectivity Services & split Apps in Apps and Marketplace (RocketChat#14211)
  LingoHub based on develop (RocketChat#14178)
  [IMPROVE] Replace livechat inquiry dialog with preview room (RocketChat#13986)
  Bump version to 0.74.3
  Room loading improvements (RocketChat#13471)
  [FIX] Invalid condition on getting next livechat agent over REST API endpoint (RocketChat#13360)
  [IMPROVE] Open rooms quicker (RocketChat#13417)
  [FIX] "Test Desktop Notifications" not triggering a notification (RocketChat#13457)
  [FIX] Translated and incorrect i18n variables (RocketChat#13463)
  Regression: Remove console.log on email translations (RocketChat#13456)
  [FIX] Properly escape custom emoji names for pattern matching (RocketChat#13408)
  [FIX] Not translated emails (RocketChat#13452)
  Added missing package dependency (RocketChat#13437)
  Update Russian localization (RocketChat#13244)
  [IMPROVE] Allow configure Prometheus port per process via Env Var (RocketChat#13436)
  [IMPROVE] Add API option "permissionsRequired" (RocketChat#13430)
  [FIX] Several Problems on HipChat Importer (RocketChat#13336)
  Add the missing uniqueId to the push notifications (RocketChat#13423)
  [FIX] Notify private settings changes even on public settings changed (RocketChat#13369)
  ...
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.

"__token __" instead "__token__" in rocketchat_i18n.js
4 participants