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: Language priority order not respected when changing server setting #32170

Merged
merged 18 commits into from
Apr 19, 2024

Conversation

gabriellsh
Copy link
Member

@gabriellsh gabriellsh commented Apr 10, 2024

Proposed changes (including videos or screenshots)

Stop forcing language switch when changing setting. Priority should be:
User Preference > Browser Language > Server Language

In most cases Server language is just a fallback, and that will mostly happen in Desktop browser. If the user has not set a language in his preferences, notifications will respect the server's setting.

image

Issue(s)

SUP-493
Closes #32008

Steps to test or reproduce

Set a language in the user preferences
Go to admin > General > Language and change to another one
The language will switch to the one set on the setting instead of keeping the user preference.

Further comments

Copy link
Contributor

dionisio-bot bot commented Apr 10, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Apr 10, 2024

🦋 Changeset detected

Latest commit: bd58283

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Apr 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.39%. Comparing base (b235c12) to head (bd58283).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32170      +/-   ##
===========================================
+ Coverage    53.68%   55.39%   +1.70%     
===========================================
  Files         2298     2317      +19     
  Lines        50518    51057     +539     
  Branches     10344    10458     +114     
===========================================
+ Hits         27123    28283    +1160     
+ Misses       20959    20261     -698     
- Partials      2436     2513      +77     
Flag Coverage Δ
e2e 54.80% <ø> (+3.17%) ⬆️
unit 75.30% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@gabriellsh gabriellsh marked this pull request as ready for review April 11, 2024 14:43
@gabriellsh gabriellsh requested review from a team as code owners April 11, 2024 14:43
apps/meteor/tests/e2e/translations.spec.ts Outdated Show resolved Hide resolved
apps/meteor/tests/e2e/translations.spec.ts Outdated Show resolved Hide resolved
@gabriellsh gabriellsh added this to the 6.8 milestone Apr 17, 2024
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Apr 19, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 19, 2024
@kodiakhq kodiakhq bot merged commit 2c85072 into develop Apr 19, 2024
42 checks passed
@kodiakhq kodiakhq bot deleted the fix/trans branch April 19, 2024 14:32
@scuciatto
Copy link
Member

/backport 6.6.8

1 similar comment
@ggazzo
Copy link
Member

ggazzo commented May 15, 2024

/backport 6.6.8

Copy link
Contributor

dionisio-bot bot commented May 15, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.6.8-32170
git cherry-pick 2c8507208f4f21bf51ee6d38bcefa62ba5c064a0
// solve the conflict
git push

after that just run /backport 6.6.8 again

@ggazzo
Copy link
Member

ggazzo commented May 15, 2024

/backport 6.7.3

Copy link
Contributor

dionisio-bot bot commented May 15, 2024

Pull request #32438 added to Project: "Patch 6.7.3"

gabriellsh added a commit that referenced this pull request May 15, 2024
@gabriellsh
Copy link
Member Author

/backport 6.6.8

Copy link
Contributor

dionisio-bot bot commented May 15, 2024

Pull request #32443 added to Project: "Patch 6.6.8"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

User/Global translation not working most of the time
7 participants