AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-14 14:26:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Catch i18n exception (#2093)

Browse Source 
* Catch i18n exception

* update

* update
This commit is contained in:
Glavo 2023-02-10 11:01:34 +08:00 committed by GitHub
parent bffbfd7af9
commit 5ba8bdad10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
View File

@ -20,6 +20,8 @@ package org.jackhuang.hmcl.util.i18n;
import org.jackhuang.hmcl.setting.ConfigHolder; import org.jackhuang.hmcl.setting.ConfigHolder;
import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale; import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
import java.util.Arrays;
import java.util.IllegalFormatException;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.logging.Level; import java.util.logging.Level;
@ -28,7 +30,8 @@ import static org.jackhuang.hmcl.util.Logging.LOG;
public final class I18n { public final class I18n {
private I18n() {} private I18n() {
}
public static SupportedLocale getCurrentLocale() { public static SupportedLocale getCurrentLocale() {
try { try {
@ -45,7 +48,15 @@ public final class I18n {
} }
public static String i18n(String key, Object... formatArgs) { public static String i18n(String key, Object... formatArgs) {
return String.format(i18n(key), formatArgs); try {
return String.format(getResourceBundle().getString(key), formatArgs);
} catch (MissingResourceException e) {
LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
} catch (IllegalFormatException e) {
LOG.log(Level.SEVERE, "Illegal format string, key=" + key + ", args=" + Arrays.toString(formatArgs), e);
}
return key + Arrays.toString(formatArgs);
} }
public static String i18n(String key) { public static String i18n(String key) {
@ -58,11 +69,6 @@ public final class I18n {
} }
public static boolean hasKey(String key) { public static boolean hasKey(String key) {
try { return getResourceBundle().containsKey(key);
getResourceBundle().getString(key);
return true;
} catch (MissingResourceException e) {
return false;
}
} }
} }