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: Translations falling back to english after refreshing the page #32348

Merged
merged 10 commits into from
May 8, 2024

Conversation

gabriellsh
Copy link
Member

@gabriellsh gabriellsh commented Apr 30, 2024

Proposed changes (including videos or screenshots)

i18next instance was being initialized twice, making it so that the resources object would be overwritten with only the fallback language which is loaded by default.

Issue(s)

Closes #32268
Closes #31802

CORE-295

Steps to test or reproduce

Further comments

@gabriellsh gabriellsh requested a review from a team as a code owner April 30, 2024 17:16
Copy link
Contributor

dionisio-bot bot commented Apr 30, 2024

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 6.8.0, but it targets 6.9.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Apr 30, 2024

🦋 Changeset detected

Latest commit: 7f382f0

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 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.58%. Comparing base (49f8547) to head (7f382f0).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32348      +/-   ##
===========================================
+ Coverage    55.53%   55.58%   +0.05%     
===========================================
  Files         2401     2403       +2     
  Lines        52855    52866      +11     
  Branches     10854    10857       +3     
===========================================
+ Hits         29353    29387      +34     
+ Misses       20898    20879      -19     
+ Partials      2604     2600       -4     
Flag Coverage Δ
e2e 54.90% <100.00%> (+0.11%) ⬆️
unit 73.46% <ø> (-0.05%) ⬇️

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

tiagoevanp
tiagoevanp previously approved these changes Apr 30, 2024
…/i18n

* 'fix/i18n' of github.com:RocketChat/Rocket.Chat:
  Create fresh-students-remember.md
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label May 8, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 8, 2024
@dougfabris dougfabris modified the milestones: 6.8, 6.9 May 8, 2024
@dougfabris dougfabris removed the stat: ready to merge PR tested and approved waiting for merge label May 8, 2024
@scuciatto scuciatto modified the milestones: 6.9, 6.8 May 8, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 8, 2024
@kodiakhq kodiakhq bot merged commit dd0bbce into develop May 8, 2024
45 checks passed
@kodiakhq kodiakhq bot deleted the fix/i18n branch May 8, 2024 13:56
ggazzo added a commit that referenced this pull request May 8, 2024
…32348)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
@scuciatto
Copy link

/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-32348
git cherry-pick dd0bbcecd4506080b5f42698f123b93537a9636a
// 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

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.7.3-32348
git cherry-pick dd0bbcecd4506080b5f42698f123b93537a9636a
// solve the conflict
git push

after that just run /backport 6.7.3 again

gabriellsh added a commit that referenced this pull request May 15, 2024
…32348)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
gabriellsh added a commit that referenced this pull request May 15, 2024
…32348)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
@gabriellsh
Copy link
Member Author

/backport 6.6.8

Copy link
Contributor

dionisio-bot bot commented May 15, 2024

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

@gabriellsh
Copy link
Member Author

/backport 6.7.3

Copy link
Contributor

dionisio-bot bot commented May 15, 2024

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

dionisio-bot bot pushed a commit that referenced this pull request May 15, 2024
…32348)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
ggazzo added a commit that referenced this pull request May 20, 2024
…32348)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
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
7 participants