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

Fix NPE when calling i18n during its initialization

Browse Source
This commit is contained in:
yushijinhun 2018-07-01 22:47:10 +08:00
parent 22bdc23a09
commit 4c8961f39a
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ package org.jackhuang.hmcl.util.i18n;
import static org.jackhuang.hmcl.util.Logging.LOG;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.logging.Level;
@ -28,20 +29,18 @@ public final class I18n {
private I18n() {}
private static ResourceBundle RESOURCE_BUNDLE;
private static ResourceBundle RESOURCE_BUNDLE = null;
static {
try {
RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
} catch (Throwable e) {
LOG.log(Level.SEVERE, "Settings cannot be initialized", e);
// fallback
RESOURCE_BUNDLE = Locales.DEFAULT.getResourceBundle();
}
}
public static ResourceBundle getResourceBundle() {
return RESOURCE_BUNDLE;
return RESOURCE_BUNDLE == null ? Locales.DEFAULT.getResourceBundle() : RESOURCE_BUNDLE;
}
public static String i18n(String key, Object... formatArgs) {
@ -51,7 +50,7 @@ public final class I18n {
public static String i18n(String key) {
try {
return getResourceBundle().getString(key);
} catch (Exception e) {
} catch (MissingResourceException e) {
LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
return key;
}