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] Whitelabel unable to find package name #2626

Merged
merged 5 commits into from
Nov 12, 2020
Merged

[FIX] Whitelabel unable to find package name #2626

merged 5 commits into from
Nov 12, 2020

Conversation

jacotec
Copy link
Contributor

@jacotec jacotec commented Nov 10, 2020

Proposed changes

The string "Notifications" is double translated, giving the strange output seen in issue #2625 when the language is set to non-English

The second file is the fix for #2614

Issue(s)

#2625 and #2614 which Github added to my existing PR instead of creating a second one ... see annotations beyond. Sorry, I'm a Github noob ;-)

How to test or reproduce

Screenshots

See #2625

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Further comments

This is my first PR on Github ... I also saw that #2614 was still unfixed in 4.12.0, so I've added that as well in a second step. I thought it would open a second PR, instead it added this change to the existing one. Sorry, I have no idea how to tell Github to make 2 PR's out of it, but I wanted to be sure that the fix for #2614 finds its way into future versions.

@jacotec jacotec changed the title Fixes translation issue for "Menu" --> "Profile" --> "Settings" --> "Notifications" Fixes for #2625 and #2614 Nov 10, 2020
Copy link
Member

@diegolmello diegolmello left a comment

Choose a reason for hiding this comment

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

LGTM

@diegolmello diegolmello changed the title Fixes for #2625 and #2614 [FIX] Whitelabel unable to find package name Nov 12, 2020
@diegolmello diegolmello merged commit 59a24a7 into RocketChat:develop Nov 12, 2020
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.

None yet

2 participants