Locale fallback

This commit is contained in:
NuclearW 2013-02-14 23:27:03 -05:00
parent caa1b0d14c
commit 092b9096e6

View File

@ -12,6 +12,7 @@ import com.gmail.nossr50.config.Config;
public final class LocaleLoader { public final class LocaleLoader {
private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale"; private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale";
private static ResourceBundle bundle = null; private static ResourceBundle bundle = null;
private static ResourceBundle enBundle = null;
private LocaleLoader() {}; private LocaleLoader() {};
@ -32,21 +33,30 @@ public final class LocaleLoader {
} }
try { try {
String output = bundle.getString(key); return getString(key, bundle, messageArguments);
}
if (messageArguments != null) { catch (MissingResourceException ex) {
MessageFormat formatter = new MessageFormat(""); try {
formatter.applyPattern(output); return getString(key, enBundle, messageArguments);
output = formatter.format(messageArguments); }
catch (MissingResourceException ex2) {
return '!' + key + '!';
} }
output = addColors(output);
return output;
} }
catch (MissingResourceException e) { }
return '!' + key + '!';
private static String getString(String key, ResourceBundle bundle, Object ... messageArguments) throws MissingResourceException {
String output = bundle.getString(key);
if (messageArguments != null) {
MessageFormat formatter = new MessageFormat("");
formatter.applyPattern(output);
output = formatter.format(messageArguments);
} }
output = addColors(output);
return output;
} }
public static Locale getCurrentLocale() { public static Locale getCurrentLocale() {
@ -70,6 +80,7 @@ public final class LocaleLoader {
} }
bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale); bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale);
enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, Locale.US);
} }
} }