Fix language setting not getting used

GreenSurvivors · Jan 23, 2024 · 3833599 · 3833599
1 parent e21615f
commit 3833599
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/managers/MessageManager.java b/Minigames/src/main/java/au/com/mineauz/minigames/managers/MessageManager.java
@@ -32,27 +32,27 @@ public class MessageManager {
      * Stores each prop file with an identifier
      */
     private static final Hashtable<String, ResourceBundle> propertiesHashMap = new Hashtable<>();
-    private static Locale locale = Locale.getDefault();
     private static Logger logger = null;
 
-    public static void setLocale(Locale locale) {
-        MessageManager.locale = locale;
-    }
-
     public static void setLogger(Logger logger) {
         MessageManager.logger = logger;
     }
 
     public static void registerCoreLanguage() {
         String tag = Minigames.getPlugin().getConfig().getString("lang", Locale.getDefault().toLanguageTag());
-        locale = Locale.forLanguageTag(tag.replace("_", "-"));
+        Locale locale = Locale.forLanguageTag(tag.replace("_", "-"));
+
+        // fall back if locale is undefined
+        if (locale.getLanguage().isEmpty()) {
+            locale = Locale.getDefault();
+        }
+
         Minigames.log().info("MessageManager set locale for language:" + locale.toLanguageTag());
         File file = new File(new File(Minigames.getPlugin().getDataFolder(), "lang"), "minigames.properties");
-        registerCoreLanguage(file, Locale.getDefault());
+        registerCoreLanguage(file, locale);
     }
 
     public static void registerCoreLanguage(File file, Locale locale) {
-        MessageManager.setLocale(locale);
         ResourceBundle minigames = null;
         if (file.exists()) {
             try {