funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 06:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve setting the default locale of the localemanager

Browse Source
This commit is contained in:
chickeneer
2021-11-06 22:00:56 -05:00
parent 38b45d7651
commit 01796e7ac4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/Locales.java
+6 -6
View File
@@ -85,7 +85,7 @@ public class Locales {
public Locales(CommandManager manager) {
this.manager = manager;
this.localeManager = LocaleManager.create(manager::getIssuerLocale);
this.localeManager = LocaleManager.create(manager::getIssuerLocale, manager.getLocales().getDefaultLocale());
this.addBundleClassLoader(this.getClass().getClassLoader());
}
@@ -108,7 +108,7 @@ public class Locales {
//noinspection unchecked
Set<Locale> supportedLanguages = manager.getSupportedLanguages();
for (Locale locale : supportedLanguages) {
for(SetMultimap<String, Locale> localeData: this.loadedBundles.values()) {
for (SetMultimap<String, Locale> localeData : this.loadedBundles.values()) {
for (String bundleName : new HashSet<>(localeData.keys())) {
addMessageBundle(bundleName, locale);
}
@@ -129,8 +129,8 @@ public class Locales {
public boolean addMessageBundle(String bundleName, Locale locale) {
boolean found = false;
for(ClassLoader classLoader: this.registeredClassLoaders) {
if(this.addMessageBundle(classLoader, bundleName, locale)) {
for (ClassLoader classLoader : this.registeredClassLoaders) {
if (this.addMessageBundle(classLoader, bundleName, locale)) {
found = true;
}
}
@@ -140,8 +140,8 @@ public class Locales {
public boolean addMessageBundle(ClassLoader classLoader, String bundleName, Locale locale) {
SetMultimap<String, Locale> classLoadersLocales = this.loadedBundles.getOrDefault(classLoader, HashMultimap.create());
if(!classLoadersLocales.containsEntry(bundleName, locale)) {
if(this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
if (!classLoadersLocales.containsEntry(bundleName, locale)) {
if (this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
classLoadersLocales.put(bundleName, locale);
this.loadedBundles.put(classLoader, classLoadersLocales);
return true;