Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix loading custom en based translations

Browse Source
This commit is contained in:
Luck 2020-10-22 09:17:30 +01:00
parent 6b05e47deb
commit ab0e25a56d
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java
View File

@ -101,7 +101,11 @@ public class TranslationManager {
*/ */
private void loadBase() { private void loadBase() {
ResourceBundle bundle = ResourceBundle.getBundle("luckperms", DEFAULT_LOCALE, UTF8ResourceBundleControl.get()); ResourceBundle bundle = ResourceBundle.getBundle("luckperms", DEFAULT_LOCALE, UTF8ResourceBundleControl.get());
this.registry.registerAll(DEFAULT_LOCALE, bundle, false); try {
this.registry.registerAll(DEFAULT_LOCALE, bundle, false);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
} }
/** /**
@ -131,7 +135,7 @@ public class TranslationManager {
// try registering the locale without a country code - if we don't already have a registration for that // try registering the locale without a country code - if we don't already have a registration for that
loaded.forEach((locale, bundle) -> { loaded.forEach((locale, bundle) -> {
Locale localeWithoutCountry = new Locale(locale.getLanguage()); Locale localeWithoutCountry = new Locale(locale.getLanguage());
if (!locale.equals(localeWithoutCountry) && this.installed.add(localeWithoutCountry)) { if (!locale.equals(localeWithoutCountry) && !localeWithoutCountry.equals(DEFAULT_LOCALE) && this.installed.add(localeWithoutCountry)) {
this.registry.registerAll(localeWithoutCountry, bundle, false); this.registry.registerAll(localeWithoutCountry, bundle, false);
} }
}); });