diff --git a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java index e1b501a3c..56bf45573 100644 --- a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java @@ -27,11 +27,12 @@ public class LocalesManager { private BentoBox plugin; private Map languages = new HashMap<>(); private static final String LOCALE_FOLDER = "locales"; + private static final String BENTOBOX = "BentoBox"; public LocalesManager(BentoBox plugin) { this.plugin = plugin; - copyLocalesFromJar(plugin.getName()); - loadLocalesFromFile(plugin.getName()); // Default + copyLocalesFromJar(BENTOBOX); + loadLocalesFromFile(BENTOBOX); // Default } /** @@ -95,10 +96,10 @@ public class LocalesManager { } } } - + /** * Loads all the locales available in the locale folder given. Used for loading all locales from plugin and addons - * + * * @param localeFolder - locale folder location relative to the plugin's data folder */ public void loadLocalesFromFile(String localeFolder) { @@ -164,12 +165,13 @@ public class LocalesManager { public Map getLanguages() { return this.languages; } - + /** * Reloads all the language files from the filesystem */ public void reloadLanguages() { languages.clear(); + copyLocalesFromJar(plugin.getName()); loadLocalesFromFile(plugin.getName()); plugin.getAddonsManager().getAddons().forEach(addon -> loadLocalesFromFile(addon.getDescription().getName())); } diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java index 308254d1b..e04e2575b 100644 --- a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java @@ -64,7 +64,7 @@ import world.bentobox.bentobox.util.Util; @PrepareForTest( { Bukkit.class, BentoBox.class, Util.class, Location.class }) public class IslandsManagerTest { - private static BentoBox plugin; + private BentoBox plugin; private UUID uuid; private User user; private PlayersManager pm;