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

Implement a proper language system #567

Merged
merged 39 commits into from
May 7, 2022
Merged

Implement a proper language system #567

merged 39 commits into from
May 7, 2022

Conversation

KingRainbow44
Copy link
Member

@KingRainbow44 KingRainbow44 commented May 6, 2022 •
edited
Loading

this PR was HELL to create.

Adds a new localization system using .json files instead of hardcoding a lot of values in .java files.
This allows for us to use a tool like Crowdin! (https://translate.grasscutters.xyz)

Changelog:

  • Formatting changes
  • Switch to using translation keys (ex. grasscutter.best.server) instead of file constants
  • Load language translation keys from a JSON file in src/main/resources/languages

@KingRainbow44 KingRainbow44 requested review from 4Benj, a user, alt3ri and memetrollsXD May 6, 2022 05:00
@KingRainbow44
Copy link
Member Author

can I just say thanks to @Melledy for helping create the en_US.json file
i did maybe 30 entries, but he did the rest

@KingRainbow44 KingRainbow44 marked this pull request as ready for review May 6, 2022 05:07
@4Benj
Copy link
Member

4Benj commented May 6, 2022 •
edited
Loading

This allows for us to use a tool like Crowdin! (https://translate.grasscutters.xyz/)

😲 There's something on the website! lol
Anyway, I'll review this when I get home

@maineeeee
Copy link

how do i login back to my genshin priv server i played yesterday but it says cant connect when i try to login back

@Scirese
Copy link
Contributor

Scirese commented May 6, 2022

Will existing translations be preserved?

Akka0 and others added 3 commits May 6, 2022 00:12
@Akka0
Choose Avatar & Enter Tower
696f629
@Akka0
Add @transient for temporary team
39a49ae
@gentlespoon
Implementes auto HP recovery at the statues.
39c932b 
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
@mcxiaoke
Copy link

mcxiaoke commented May 6, 2022

other existing language files should be translated to the new format

@ghost
Copy link

ghost commented May 6, 2022

Yes, someone will have to migrate the CN ones over before this gets pushed.

@Scirese
Copy link
Contributor

Scirese commented May 6, 2022

Yes, someone will have to migrate the CN ones over before this gets pushed.

Thanks,That will greatly reduce our work. :)

@gentlespoon
The statues will now automatically regen their HP volume over time.
0102a3c 
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
Akka0 and others added 22 commits May 7, 2022 00:11
@Akka0
Tower Dungeons Handoff between level and floor
6144f47
@Akka0
Add some lua functions
81ca860
@Akka0
Merge pull request #2 from Grasscutters/development
7279842 
Development
@Akka0
Merge branch 'tower' into development
321a2a3
@Akka0
Merge pull request #3 from Akka0/development
6b82a53 
Development
@Akka0
a little fix
22df346
@exzork
add config option to enable cors for dispatchserver (#579)
63a37ac
@CCasusensa @ShigemoriHakura
@KanyeWestc @XTL676 @nkxingxh @Yazawazi @wuwuwu223 @omg-xtao @Sakura @NewNeko-2022 @JimWails @buttercookies
Implement Avatar Expedition System
19a2c9b 
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
Merge pull request #594 from Akka0/tower
6d89477 
Tower Dungeons Handoff between levels
@cfuncode
Improved fault tolerance for json file deserialization (#595)
2b58d69 
* 修复一个Gson发序列化json文件的空值问题

* Improved fault tolerance for json file deserialization
@Arikatsu
Add config option to change console server's signature, namecard, lev…
c4e1108 
…el and world level (#586)

* Add files via upload

* Add files via upload

* Update GameConstants.java

* Update Config.java

* Update PacketGetPlayerFriendListRsp.java
fix scence block loading bug
7109578
@gentlespoon
Allow walking away from the statue within 2.5s to stop auto heal.
1d4a41f
@gentlespoon
Fix #593: Accidental death of character
c582814
@KingRainbow44
Convert to the superior language system. (pt. 3)
438f845
@KingRainbow44
Add the en-US language.
7899a60
@KingRainbow44
Add the zh-TW language.
57a3d53
@KingRainbow44
Ensure we have a fallback for localization
686df18
@KingRainbow44
Update .gitignore & remove files
d8719ec
@KingRainbow44
Merge development into localization
80c9119
@KingRainbow44
Update Utils.java
4264ca0
@KingRainbow44
Rename en-US locale
59b24aa
@KingRainbow44
Copy link
Member Author

to the person who initially added the language system, please don't use constants for languages

@KingRainbow44 KingRainbow44 merged commit 4455072 into development May 7, 2022
@ghost ghost deleted the localization branch May 7, 2022 02:19
Birdulon pushed a commit to Birdulon/Grasscutter that referenced this pull request Aug 21, 2022
@KingRainbow44
Merge pull request Grasscutters#567 from Grasscutters/localization
38fd7bb 
Implement a proper language system
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@4Benj 4Benj 4Benj approved these changes

@memetrollsXD memetrollsXD memetrollsXD approved these changes

@alt3ri alt3ri Awaiting requested review from alt3ri

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

Successfully merging this pull request may close these issues.

None yet