From 832c029db684207f8bd2281bb8baab6f8c9352ae Mon Sep 17 00:00:00 2001 From: Haowei Wen Date: Wed, 1 Sep 2021 16:39:53 +0800 Subject: [PATCH] fix: can't run as named module --- .../main/java/org/jackhuang/hmcl/util/i18n/Locales.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java index a2d7b01d4..e0d703b99 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java @@ -22,6 +22,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Lazy; +import org.jackhuang.hmcl.util.platform.JavaVersion; import java.io.IOException; import java.text.SimpleDateFormat; @@ -107,7 +108,12 @@ public final class Locales { SupportedLocale(Locale locale, String name) { this.locale = locale; this.name = name; - resourceBundle = ResourceBundle.getBundle("assets.lang.I18N", locale, UTF8Control.INSTANCE); + if (JavaVersion.CURRENT_JAVA.getParsedVersion() == JavaVersion.JAVA_8) { + resourceBundle = ResourceBundle.getBundle("assets.lang.I18N", locale, UTF8Control.INSTANCE); + } else { + // UTF-8 is supported in Java 9+ + resourceBundle = ResourceBundle.getBundle("assets.lang.I18N", locale); + } } public Locale getLocale() {