lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #3076: 修复无法识别部分简体中文环境的问题 (#4350)

Browse Source
This commit is contained in:
Glavo
2025-08-29 20:31:05 +08:00
committed by GitHub
parent 67e4dddda1
commit 1a3b473356
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java
View File

@@ -122,24 +122,40 @@ public final class Locales {
if (resourceBundle == null) { if (resourceBundle == null) {
if (this != DEFAULT && this.locale == DEFAULT.locale) { if (this != DEFAULT && this.locale == DEFAULT.locale) {
bundle = DEFAULT.getResourceBundle(); bundle = DEFAULT.getResourceBundle();
} else if (this == WENYAN) { } else {
bundle = ResourceBundle.getBundle("assets.lang.I18N", locale, new ResourceBundle.Control() { bundle = ResourceBundle.getBundle("assets.lang.I18N", locale, new ResourceBundle.Control() {
@Override @Override
public List<Locale> getCandidateLocales(String baseName, Locale locale) { public List<Locale> getCandidateLocales(String baseName, Locale locale) {
if (locale.getLanguage().equals("zh")) {
boolean simplified;
String script = locale.getScript();
String region = locale.getCountry();
if (script.isEmpty())
simplified = region.equals("CN") || region.equals("SG");
else
simplified = script.equals("Hans");
if (simplified) {
return List.of(
Locale.SIMPLIFIED_CHINESE,
Locale.CHINESE,
Locale.ROOT
);
}
}
if (locale.getLanguage().equals("lzh")) { if (locale.getLanguage().equals("lzh")) {
return List.of( return List.of(
locale, locale,
Locale.forLanguageTag("zh"), Locale.CHINESE,
Locale.ROOT Locale.ROOT
); );
} }
return super.getCandidateLocales(baseName, locale); return super.getCandidateLocales(baseName, locale);
} }
}); });
} else {
bundle = ResourceBundle.getBundle("assets.lang.I18N", locale);
} }
resourceBundle = bundle; resourceBundle = bundle;
} }