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: Custom translations do not work #30383

Merged
merged 6 commits into from
Sep 21, 2023

Conversation

matheusbsilva137
Copy link
Member

@matheusbsilva137 matheusbsilva137 commented Sep 13, 2023

Proposed changes (including videos or screenshots)

Issue(s)

Introduced in #29097

Steps to test or reproduce

Further comments

TC-953

@changeset-bot
Copy link

changeset-bot bot commented Sep 13, 2023

🦋 Changeset detected

Latest commit: 0ff52d8

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

This PR includes changesets to release 29 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings 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/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-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

@codecov
Copy link

codecov bot commented Sep 13, 2023

Codecov Report

Merging #30383 (0ff52d8) into release-6.4.0 (b46b7ee) will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           release-6.4.0   #30383      +/-   ##
=================================================
- Coverage          50.09%   50.04%   -0.05%     
=================================================
  Files                775      775              
  Lines              14491    14491              
  Branches            2618     2618              
=================================================
- Hits                7259     7252       -7     
- Misses              6825     6829       +4     
- Partials             407      410       +3     
Flag Coverage Δ
e2e 48.45% <ø> (-0.06%) ⬇️
unit 60.12% <ø> (ø)

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

@matheusbsilva137 matheusbsilva137 marked this pull request as ready for review September 13, 2023 14:42
@matheusbsilva137 matheusbsilva137 requested a review from a team as a code owner September 13, 2023 14:42
yash-rajpal
yash-rajpal previously approved these changes Sep 13, 2023
Copy link
Contributor

@tassoevan tassoevan left a comment

Choose a reason for hiding this comment

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

Is ignoring the prefix (instead of assuming it's core) a good idea? Also, what about server-side translations?

@yash-rajpal
Copy link
Member

yash-rajpal commented Sep 13, 2023

Is ignoring the prefix (instead of assuming it's core) a good idea? Also, what about server-side translations?

The final results object doesn't contain the namespace prefix for any of the translations, we remove the namespace prefix before adding it to the final translations object. In this case it wasn't working for custom-translations not having namespace prefix so this fix handles that case.

@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 21, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Sep 21, 2023
@kodiakhq kodiakhq bot merged commit ec60dbe into release-6.4.0 Sep 21, 2023
41 of 42 checks passed
@kodiakhq kodiakhq bot deleted the fix/custom-translations-not-working branch September 21, 2023 17:50
@scuciatto scuciatto added this to the 6.4.0 milestone Sep 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants