mirror of
https://github.com/aikar/commands.git
synced 2026-05-31 06:11:55 +00:00
Load languages post locales construction
This commit is contained in:
@@ -138,6 +138,7 @@ public class BukkitCommandManager extends CommandManager {
|
||||
public BukkitLocales getLocales() {
|
||||
if (this.locales == null) {
|
||||
this.locales = new BukkitLocales(this);
|
||||
this.locales.loadLanguages();
|
||||
}
|
||||
return locales;
|
||||
}
|
||||
|
||||
@@ -39,6 +39,10 @@ public class BukkitLocales extends Locales {
|
||||
public BukkitLocales(BukkitCommandManager manager) {
|
||||
super(manager);
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadLanguages() {
|
||||
String pluginName = "acf-" + manager.plugin.getDescription().getName();
|
||||
addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
|
||||
}
|
||||
|
||||
@@ -88,6 +88,7 @@ public class BungeeCommandManager extends CommandManager {
|
||||
public BungeeLocales getLocales() {
|
||||
if (this.locales == null) {
|
||||
this.locales = new BungeeLocales(this);
|
||||
this.locales.loadLanguages();
|
||||
}
|
||||
return locales;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
package co.aikar.commands;
|
||||
|
||||
public class BungeeLocales extends Locales {
|
||||
private final BungeeCommandManager manager;
|
||||
|
||||
public BungeeLocales(BungeeCommandManager manager) {
|
||||
super(manager);
|
||||
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadLanguages() {
|
||||
super.loadLanguages();
|
||||
String pluginName = "acf-" + manager.plugin.getDescription().getName();
|
||||
addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
|
||||
}
|
||||
|
||||
@@ -52,7 +52,6 @@ public abstract class CommandManager {
|
||||
}
|
||||
};
|
||||
defaultFormatter = plain;
|
||||
getLocales().addMessageBundles("acf-core");
|
||||
formatters.put(MessageType.INFO, plain);
|
||||
formatters.put(MessageType.SYNTAX, plain);
|
||||
formatters.put(MessageType.ERROR, plain);
|
||||
|
||||
@@ -44,11 +44,14 @@ public class Locales {
|
||||
this.localeManager = LocaleManager.create(manager::getIssuerLocale);
|
||||
}
|
||||
|
||||
public void loadLanguages() {
|
||||
addMessageBundles("acf-core");
|
||||
}
|
||||
|
||||
public Locale getDefaultLocale() {
|
||||
return this.localeManager.getDefaultLocale();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looks for all previously loaded bundles, and if any new Supported Languages have been added, load them.
|
||||
*/
|
||||
|
||||
@@ -100,6 +100,7 @@ public class SpongeCommandManager extends CommandManager {
|
||||
public SpongeLocales getLocales() {
|
||||
if (this.locales == null) {
|
||||
this.locales = new SpongeLocales(this);
|
||||
this.locales.loadLanguages();
|
||||
}
|
||||
return locales;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
package co.aikar.commands;
|
||||
|
||||
public class SpongeLocales extends Locales{
|
||||
private final SpongeCommandManager manager;
|
||||
|
||||
public SpongeLocales(SpongeCommandManager manager) {
|
||||
super(manager);
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadLanguages() {
|
||||
String pluginName = "acf-" + manager.plugin.getName();
|
||||
addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user