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.

Sign up for GitHub

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

Jump to bottom

Language Overhaul #3287

Closed
wants to merge 58 commits into from
Closed

Language Overhaul #3287

wants to merge 58 commits into from

Conversation

3gf8jv4dv
Copy link
Contributor

@3gf8jv4dv 3gf8jv4dv commented Sep 12, 2024 •
edited
Loading

Continuation of #3150.

This PR makes important quality improvements to the language used by the main users of HMCL (Chinese and some English users). Due to my limited ability, for other languages, there are only minor revisions. If I get a chance later, I might overhaul other languages.

I would appreciate it if you could take the time to review this PR.

Changelog

  • Major revisions to English and Chinese variants
  • Minor revisions to Spanish, Japanese and Russian
  • For All Languages: Unified the format of all line breaks, and it is now easier to read in plain text
  • For All Languages: Optimized homepage hints to make them look cleaner
  • For All Languages: Adjusted the order of translation keys for Curse, Modrinth and game.crash.reason
  • For All Languages: Fixed some wrong key names and some irrelevant translations
  • For English and Chinese variants: Unified most terms to avoid confusion
  • For English and Chinese variants: Changed some terminology to make it consistent with the current situation and align with the terminology of some authoritative websites
  • For English and Chinese variants: Optimized some translated descriptions to make them more accurate and easier to understand
  • For English and Chinese variants: Supplemented all translations, now the number of translation keys should be consistent for English and Chinese variants
  • For GitHub Action: Removed unnecessary translation checks
  • For Launcher: Added category items above "Settings → Global Settings"
  • For Launcher: Capitalized the text above the sidebar
  • For Launcher: Separated mod update channel from game update channel (Why do so many places that should be translated differently use the same key...)
  • For Launcher: Unified launcher update channel names
    ...

Check out all commits or the Files changed section for all changes.

@3gf8jv4dv
Revise 1
651b4b0 
Format all language files
@3gf8jv4dv
Revise 2
e129d65 
Fix some key typos
@3gf8jv4dv
Revise 3
efebd16 
Fix other language translations mixed in ja and ru
@3gf8jv4dv
Revise 4
09c7509 
Overhaul of Chinese (Simplified, Mainland China)
@3gf8jv4dv
Revise 5
a2bde8d 
Overhaul of English (United States)
@3gf8jv4dv
Revise 6
9c12f8f 
Revise and unify some links
@3gf8jv4dv
Revise 7
82389e8 
- Overhaul of Chinese (Simplified, Mainland China)
- Minor revision of English (United States)
@3gf8jv4dv
Revise 8
a27cb88 
Various revisions for:
- English (United States)
- Chinese (Simplified, Mainland China)

Several translations port from HMCL-dev#3129.
@3gf8jv4dv
Revise 9
a8e037a 
Misc revisions.
@3gf8jv4dv
Revise 10
83c0673 
- Overhaul of Chinese (Traditional, Taiwan)
- Major revisions of English (United States) and Chinese (Simplified, Mainland China)
- Various revisions of other languages
- Curse & Modrinth translation key order adjustment
- Fix CheckTranslations
- Remove unnecessary translation checks
@3gf8jv4dv
Revise 11
c760a90 
Redesign homepage hint style for all languages.
@3gf8jv4dv
Revise 12
1560a7c 
Various revisions of English and Chinese variants.
@3gf8jv4dv
Revise 13
11379fe 
Various revisions of various languages.
@burningtnt burningtnt mentioned this pull request Sep 12, 2024
Open
@3gf8jv4dv
Revise 14
6078dba 
- Add the category item `Game` above `Global Settings`
- Some translation revisions of Chinese (Traditional, Taiwan)
- Optimize translation related to World page
- Various revisions
@3gf8jv4dv
Revise 15
9876bd7 
Capitalize text above the sidebar line
@3gf8jv4dv 3gf8jv4dv mentioned this pull request Sep 13, 2024
Closed
@3gf8jv4dv
Revise 16
c89500c 
- Optimize the Russian partial translation so that it can be fully displayed in the UI
- Optimize the loader offline installer description to make it shorter
- Various revisions
@3gf8jv4dv
Copy link
Contributor Author

@burningtnt @Glavo @zkitefly or others who are interested in this...

It is now almost complete, your review is greatly needed. You can check the Files changed section, or download a build from GHA to test it.

@3gf8jv4dv
Revise 17
3f13738 
Minor revisions of Chinese variants.
zkitefly
zkitefly reviewed Sep 14, 2024
View reviewed changes
build.gradle.kts Outdated
Copy link
Member

Choose a reason for hiding this comment

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

这个检测还是有必要的，以防有人输错

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think a more appropriate form is to give a reminder in the form of review/suggestion when a user submits a related PR. But let’s see what others think.

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
3gf8jv4dv and others added 8 commits September 15, 2024 19:22
@3gf8jv4dv @zkitefly
Revise 18
4a79187 
Apply suggestions from zkitefly (semicolon)

Co-authored-by: Zkitefly <[email protected]>
@3gf8jv4dv @hejiehao
Revise 19
f9c2848 
Apply suggestion from hejiehao (terms upper/lower case)

Co-authored-by: hejiehao <[email protected]>
@3gf8jv4dv @zkitefly
Revise 20
61005bf 
Apply suggestions from zkitefly (你/您)

Co-authored-by: Zkitefly <[email protected]>
@3gf8jv4dv
Revise 21
5da5e5c 
Misc revisions of Chinese (Simplified, Mainland China)
@3gf8jv4dv
Revise 22
d04de4e 
- Fix a mistake I made
- Misc revisions
@3gf8jv4dv
Revise 23
da004db 
- Revert changes of `version.game.snapshot(s)`
- Improve translation of `version.game.old` in Chinese variants
- Improve translation of `install.failed.optifine_conflict`
- Improve spacing style of slashes
- Improve some punctuation
- Fix some translations of Chinese variants
@3gf8jv4dv
Revise 24
7dd9835 
Various revisions of English and Chinese variants
@3gf8jv4dv
Revise 25
39cf163 
Oops...
@3gf8jv4dv
Revise 39
d60f6bb 
Fix line wrapping in some error messages
@3gf8jv4dv
Revise 40
60fbe44 
Oops...
@3gf8jv4dv
Copy link
Contributor Author

3gf8jv4dv commented Sep 23, 2024 •
edited
Loading

Now the revision of English and Chinese is basically completed (REALLY).

Next plan:

  • Try to fix some UI translation issues (such issues require code changes to resolve)
  • Continue to review and revise English and Chinese
  • Try to overhaul the other three languages
  • Add several new languages (if I still have time and energy)

In the meantime, any reviews are still welcome.

@3gf8jv4dv
Revise 41
21ff98f 
- Unify brackets in Chinese language
- Various revisions
@3gf8jv4dv
Revise 42
1d13030 
Fix proxy `host` and `port` translation halignment being different from other translations
@3gf8jv4dv
Revise 43
8b07b48 
Revise Microsoft login hint of Chinese language to be consistent with
actual content displayed on Microsoft website
@3gf8jv4dv
Revise 44
ff3c106 
- For Chinese, rewrite Microsoft login hint to make it clean and clear
- Remove some useless translation keys
- For `game.crash.reason.graphics_driver`, remove the content about
  OpenGL, since OpenGL is now used by default, this is not needed
@3gf8jv4dv
Revise 45
e888172 
Various revisions
@3gf8jv4dv
Revise 46
b48b381 
Various revisions
@3gf8jv4dv
Revise 47
2ff343e 
- Emphasis on "版本隔离" in the Mainland Chinese variant
- Fix some English grammar — it should be more perfect now
@3gf8jv4dv
Revise 48
86216fb 
Minor revision of Traditional Chinese
@3gf8jv4dv
Revise 49
a28f050 
Various revisions
@3gf8jv4dv
Revise 50
003bef4 
misc
@3gf8jv4dv
Revise 51
7f2d60e 
oops...
@3gf8jv4dv
Revise 52
0ca2325 
Various revisions
@3gf8jv4dv
Merge branch 'main' into lang-revision
6cced61
@3gf8jv4dv
Merge branch 'main' into lang-revision
90edecc
@3gf8jv4dv
Merge branch 'main' into lang-revision
272b7ea
@3gf8jv4dv
Merge branch 'main' into lang-revision
15c31cf
@3gf8jv4dv
Revise 57
b9b3066 
Revision of Chinese (Traditional, Taiwan)
@3gf8jv4dv
Merge branch 'main' into lang-revision
e966500
@Glavo
Copy link
Member

Glavo commented Oct 13, 2024

I think this is a very large PR and it's difficult to review and give feedback. Can you split it into multiple smaller PRs?

@3gf8jv4dv
Copy link
Contributor Author

I think this is a very large PR and it's difficult to review and give feedback. Can you split it into multiple smaller PRs?

OK. I will do it later.

@3gf8jv4dv
Copy link
Contributor Author

3gf8jv4dv commented Oct 14, 2024 •
edited
Loading

Changes involving the code have been ported to the following PRs:

Regarding language revision, i18n key revision and line wrapping optimization, I am still working hard on porting...

cc @Glavo

@Glavo Glavo closed this Oct 14, 2024
@3gf8jv4dv 3gf8jv4dv mentioned this pull request Oct 19, 2024
Merged
@3gf8jv4dv 3gf8jv4dv deleted the lang-revision branch October 25, 2024 04:53
@3gf8jv4dv 3gf8jv4dv mentioned this pull request Dec 9, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hejiehao hejiehao hejiehao left review comments

@zkitefly zkitefly zkitefly left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@3gf8jv4dv @burningtnt @Glavo @zkitefly @hejiehao