diff --git a/acf-parent.iml b/acf-parent.iml index 83fb2092..5c58bc6f 100644 --- a/acf-parent.iml +++ b/acf-parent.iml @@ -8,6 +8,7 @@ + \ No newline at end of file diff --git a/bukkit/acf-bukkit.iml b/bukkit/acf-bukkit.iml index ab67942b..7a23b06c 100644 --- a/bukkit/acf-bukkit.iml +++ b/bukkit/acf-bukkit.iml @@ -21,15 +21,17 @@ + + - + \ No newline at end of file diff --git a/bungee/acf-bungee.iml b/bungee/acf-bungee.iml index 50197d15..d6bcb2d6 100644 --- a/bungee/acf-bungee.iml +++ b/bungee/acf-bungee.iml @@ -20,6 +20,8 @@ + + @@ -33,7 +35,7 @@ - + \ No newline at end of file diff --git a/core/acf-core.iml b/core/acf-core.iml index 2c3840b4..9fb1fe8b 100644 --- a/core/acf-core.iml +++ b/core/acf-core.iml @@ -16,8 +16,10 @@ - + + + \ 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 7dc37893..ee339412 100644 --- a/core/src/main/java/co/aikar/commands/Locales.java +++ b/core/src/main/java/co/aikar/commands/Locales.java @@ -42,8 +42,8 @@ public class Locales { Locales(CommandManager manager) { this.manager = manager; - this.localeManager = LocaleManager.create(manager::getIssuerLocale); - this.localeManager.addMessageBundle("acf-core", CORE_LANGUAGES); + this.localeManager = LocaleManager.create(manager.getClass(), manager::getIssuerLocale); + this.localeManager.addMessageBundles("acf-core"); } public Locale getDefaultLocale() { @@ -53,7 +53,7 @@ public class Locales { public void addMessageBundles(String... bundleNames) { for (String bundleName : bundleNames) { - this.localeManager.addMessageBundle(bundleName, CORE_LANGUAGES); + this.localeManager.addMessageBundles(bundleName); } } @@ -72,8 +72,8 @@ public class Locales { public String getMessage(CommandIssuer issuer, MessageKey key) { String message = this.localeManager.getMessage(issuer, key); if (message == null) { - manager.log(LogLevel.ERROR, "Missing Language Key: " + key); - message = ""; + manager.log(LogLevel.ERROR, "Missing Language Key: " + key.getKey()); + message = ""; } return message; } diff --git a/example/acf-example.iml b/example/acf-example.iml index 1272a5b2..38a1074f 100644 --- a/example/acf-example.iml +++ b/example/acf-example.iml @@ -27,7 +27,7 @@ - + @@ -38,6 +38,8 @@ + + \ No newline at end of file diff --git a/paper/acf-paper.iml b/paper/acf-paper.iml index 722fd056..7ac82efa 100644 --- a/paper/acf-paper.iml +++ b/paper/acf-paper.iml @@ -21,6 +21,8 @@ + + @@ -34,11 +36,11 @@ - + \ No newline at end of file diff --git a/sponge/acf-sponge.iml b/sponge/acf-sponge.iml index bebb68f6..7e5963f4 100644 --- a/sponge/acf-sponge.iml +++ b/sponge/acf-sponge.iml @@ -20,9 +20,10 @@ + + - @@ -41,6 +42,7 @@ + \ No newline at end of file