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

I18n conflict resolve #3936

Merged
merged 10 commits into from Dec 14, 2022
Merged

I18n conflict resolve #3936

merged 10 commits into from Dec 14, 2022

Conversation

ab77
Copy link
Contributor

@ab77 ab77 commented Dec 12, 2022

No description provided.

@ab77
Copy link
Contributor Author

ab77 commented Dec 12, 2022

@RoderickQiu @mcraa this PR replaces #3790.

Please review and approve/merge when ready.

@RoderickQiu
Copy link
Contributor

Oh, good, thanks!

RoderickQiu and others added 7 commits December 12, 2022 18:36
- make i18n using i18next
- add Chinese (Simplified) support
- split translations from i18n.ts to several .ts files in lib/gui/app/i18n
- make a README for new language changes
- add zh-TW instead of only zh-CN
Optimized several translations.
This commit itself is only a patch, but as a pull request must have at least one commit with a change-type.

Change-Type: minor
more direct string-concatenation, thanks to @lurch
- use `import * as i18next from 'i18next';` instead of `import i18next from 'i18next';` and add an specific env to bypass mocha test
- optimized several translations
according to a suggestion of @lurch
Copy link
Contributor

@mcraa mcraa left a comment

Choose a reason for hiding this comment

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

Settings modal does not open atm.
Neither the flash from URL modal.

@balena-ci balena-ci merged commit 898fe4f into master Dec 14, 2022
@balena-ci balena-ci deleted the i18n-conflict-resolve branch December 14, 2022 16:15
@mcraa
Copy link
Contributor

mcraa commented Dec 14, 2022

thanks again for the effort and patience @RoderickQiu

@RoderickQiu
Copy link
Contributor

Hooray!

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

4 participants