Fixed the issue #1577 i18n Team Loadout UI #2443

macerator-yaro · 2024-09-15T06:19:32Z

Describe your changes

Replaced the raw-string sections with t function or Trans component, and wrote them into the corresponding files in libs/gi/localization/assets/locales/en.

Below are the changes:
marked with TODO: Translation and raw-string sections on the Teams, Weapons, and Characters pages

If this PR is successfully merged, please upload the translations into POEditor.

Issue or discord link

fixed #1577

Testing/validation

Checklist before requesting a review (leave this PR as draft if any part of this list is not done.)

I have commented my code in hard-to understand areas.
I have made corresponding changes to README or wiki.
For front-end changes, I have updated the corresponding English translations.
I have run yarn run mini-ci locally to validate format and lint.
If I have added a new library or app, I have updated the deployment scripts to ignore changes as needed

github-actions · 2024-09-15T06:23:46Z

[frontend] [Sun Sep 15 06:23:46 UTC 2024] - Deployed f8a68fb to https://genshin-optimizer-prs.github.io/pr/2443/frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Mon Sep 16 15:21:18 UTC 2024] - Deployed 3ad01e5 to https://genshin-optimizer-prs.github.io/pr/2443/frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Sep 17 11:42:08 UTC 2024] - Deployed 4d77dba to https://genshin-optimizer-prs.github.io/pr/2443/frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Sep 17 13:39:48 UTC 2024] - Deployed 02e5043 to https://genshin-optimizer-prs.github.io/pr/2443/frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Sep 17 23:35:12 UTC 2024] - Deployed bf55576 to https://genshin-optimizer-prs.github.io/pr/2443/frontend (Takes 3-5 minutes after this completes to be available)

[Wed Sep 18 00:57:38 UTC 2024] - Deleted deployment

frzyc

Mostly LGTM, very consistent tagging for l10n. One minor change for list formatting.

frzyc · 2024-09-15T23:53:44Z

libs/gi/page-team/src/CharacterDisplay/Tabs/TabTheorycraft/index.tsx

@@ -399,9 +399,17 @@ export default function TabTheorycraft() {
                  ))
                  .flatMap((value, index, array) => {
                    if (index === array.length - 2)
-                      return [value, <span key="and">, and </span>]
+                      return [


I think this can be done with more native i18next approach: https://www.i18next.com/translation-function/formatting#list

I couldn’t figure out how to directly pass a JSX element to the t function.😢
It seems that only string array can be passed to the List format. When I passed a JSX element array, it was displayed as [object Object].

This was the only way I could think of lol

I see, you add a token to the Intl.ListFormat, generate, and then replace the tokens. I think that is a fine solution for now. I am fine with this solution, I'd say you should try to use a less-used unicode character as the token. (maybe the newline character? since this is suppose to be a single line)

Is this okay? Sorry if I misunderstood your intention.

Sorry, you mean U+200B or something like that, right?
~~I tried that, but for some reason I got an 'Uncaught' error and it didn't work.~~
~~I'm so sorry, it seems to have been a bug in vscode or something. It worked fine.~~

cool, a very novel solution, nice thinking.

Sorry again and again, I found the cause of the error. I hadn't taken locale differences into account at all.😭
I pushed the wrong fix, I will fix it, and move to the new namespace again tomorrow.

I'll change the PR to a draft for now, you can change it back to ready once you finish cooking

frzyc · 2024-09-16T00:05:05Z

libs/gi/localization/assets/locales/en/page_character.json

@@ -8,6 +8,45 @@
    "theorycraft": "Theorycraft",
    "upopt": "Artifact Upgrader"
  },
+  "buildCardTip": {


Not really an action to change, just more of an observation:
originally the bulk of character related content was on the character page, hence page_character, now, most of that is happening in the team page, hence page_team. However, things like builds and loadouts are actually shared between the two pages, since the character page has become a loadout/team manager. I am inclined to keep associated l10n in the same json, rather than splitting them by page, so I wonder if it makes sense to create separate l10n namespaces, such as build.json and loadout.json for l10ns specific to those concepts.

@macerator-yaro I discussed with Tech Lead, I think it would make sense to divide up the l10n into separate files. Can you move the build related terms to build.json, and loadout related terms to loadout.json?

macerator-yaro · 2024-09-17T11:50:36Z

Terms have been moved to new namespaces. I'm not sure if this is the right way to divide it, but I gave it a try anyway.
and also List Formatting re-fix is finished.

frzyc

Last bit of namespacing change, I appreciate all the work so far.

frzyc · 2024-09-17T20:55:17Z

libs/gi/localization/assets/locales/en/artifact.json

@@ -121,5 +121,11 @@
  "rvSliderBtn": {
    "maximum": "MRV",
    "current": "RV"
+  },
+  "optExcludeModal": {


This is a optimizer config, should go to page_character_optimizer.json

frzyc · 2024-09-17T20:57:02Z

libs/gi/localization/assets/locales/en/page_character_optimize.json

+  "generatedOn": "Build generated on: ",
+  "selectChar": "Select a character to generate builds.",
+  "clearBuildsBtn": "Clear Builds",
+  "createBuildTc": {


"createBuildTc", "createBuildReal" and "buildDisplay" should go to build.json

Completed. :)

frzyc

LGTM, thanks for all your work!

macerator-yaro and others added 8 commits September 12, 2024 03:58

add translation

0c4aace

Merge branch 'frzyc:master' into translation-teams

1961a64

add translation

49b3e63

add translation

2b2fd48

add translation

aa9d8f7

add + fix

951bb69

Merge branch 'frzyc:master' into translation-teams

89ed3b9

fix + mini-ci

2bad7a1

frzyc requested changes Sep 15, 2024

View reviewed changes

frzyc reviewed Sep 16, 2024

View reviewed changes

fix list formatting

b6b940e

frzyc marked this pull request as draft September 16, 2024 17:28

create new namespaces + re-fix list formatting

749f38a

macerator-yaro marked this pull request as ready for review September 17, 2024 11:51

add 1 term

4f07222

frzyc requested changes Sep 17, 2024

View reviewed changes

fix namespacing

7bab1ea

frzyc approved these changes Sep 18, 2024

View reviewed changes

frzyc merged commit b004f42 into frzyc:master Sep 18, 2024
8 checks passed

macerator-yaro deleted the translation-teams branch September 18, 2024 10:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed the issue #1577 i18n Team Loadout UI #2443

Fixed the issue #1577 i18n Team Loadout UI #2443

macerator-yaro commented Sep 15, 2024 •

edited

Loading

github-actions bot commented Sep 15, 2024 •

edited

Loading

frzyc left a comment

frzyc Sep 15, 2024

macerator-yaro Sep 16, 2024

macerator-yaro Sep 16, 2024

frzyc Sep 16, 2024

macerator-yaro Sep 16, 2024

macerator-yaro Sep 16, 2024 •

edited

Loading

frzyc Sep 16, 2024

macerator-yaro Sep 16, 2024

frzyc Sep 16, 2024

frzyc Sep 16, 2024

frzyc Sep 16, 2024

macerator-yaro commented Sep 17, 2024

frzyc left a comment

frzyc Sep 17, 2024

frzyc Sep 17, 2024

macerator-yaro Sep 17, 2024

frzyc left a comment

Fixed the issue #1577 i18n Team Loadout UI #2443

Fixed the issue #1577 i18n Team Loadout UI #2443

Conversation

macerator-yaro commented Sep 15, 2024 • edited Loading

Describe your changes

Issue or discord link

Testing/validation

Checklist before requesting a review (leave this PR as draft if any part of this list is not done.)

github-actions bot commented Sep 15, 2024 • edited Loading

frzyc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

macerator-yaro Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

macerator-yaro commented Sep 17, 2024

frzyc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

frzyc left a comment

Choose a reason for hiding this comment

macerator-yaro commented Sep 15, 2024 •

edited

Loading

github-actions bot commented Sep 15, 2024 •

edited

Loading

macerator-yaro Sep 16, 2024 •

edited

Loading