From 1ee1fcb9b3f5f5e283410ba84cb6bc5c22b15c6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 03:55:54 -0500 Subject: [PATCH] update locales stuff to latest manager to go around the auto locale detect --- .../runConfigurations/ACF__Core___Bukkit_.xml | 29 +++++++++++++++++++ .../main/java/co/aikar/commands/Locales.java | 9 ++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 .idea/runConfigurations/ACF__Core___Bukkit_.xml diff --git a/.idea/runConfigurations/ACF__Core___Bukkit_.xml b/.idea/runConfigurations/ACF__Core___Bukkit_.xml new file mode 100644 index 00000000..6c1be024 --- /dev/null +++ b/.idea/runConfigurations/ACF__Core___Bukkit_.xml @@ -0,0 +1,29 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/java/co/aikar/commands/Locales.java b/core/src/main/java/co/aikar/commands/Locales.java index b45ef2e3..7dc37893 100644 --- a/core/src/main/java/co/aikar/commands/Locales.java +++ b/core/src/main/java/co/aikar/commands/Locales.java @@ -34,13 +34,16 @@ import java.util.Map; @SuppressWarnings("WeakerAccess") public class Locales { + private static final Locale[] CORE_LANGUAGES = new Locale[]{ + Locale.ENGLISH + }; private final CommandManager manager; private final LocaleManager localeManager; Locales(CommandManager manager) { this.manager = manager; this.localeManager = LocaleManager.create(manager::getIssuerLocale); - this.localeManager.addMessageBundles("acf-core"); + this.localeManager.addMessageBundle("acf-core", CORE_LANGUAGES); } public Locale getDefaultLocale() { @@ -49,7 +52,9 @@ public class Locales { public void addMessageBundles(String... bundleNames) { - this.localeManager.addMessageBundles(bundleNames); + for (String bundleName : bundleNames) { + this.localeManager.addMessageBundle(bundleName, CORE_LANGUAGES); + } } public void addMessageBundle(String bundleName, Locale locale) {