2.1-SNAPSHOT: 2.0.3: Fix language files not inheriting from default l…

…ocale.
SolarMC-Dev · Feb 4, 2021 · 3b317c7 · 3b317c7
1 parent 7e102e6
commit 3b317c7
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/language/src/main/java/com/github/sirblobman/api/language/LanguageManager.java b/language/src/main/java/com/github/sirblobman/api/language/LanguageManager.java
@@ -51,6 +51,19 @@ public String getMessage(CommandSender sender, String key) {
             return (message == null ? missingValue : message);
         }
 
+        String defaultLocaleFileName = getDefaultLocaleFileName();
+        YamlConfiguration defaultConfig = this.configurationManager.get(defaultLocaleFileName);
+
+        if(defaultConfig.isList(key)) {
+            List<String> messageList = defaultConfig.getStringList(key);
+            return String.join("\n", messageList);
+        }
+
+        if(defaultConfig.isString(key)) {
+            String message = defaultConfig.getString(key);
+            return (message == null ? missingValue : message);
+        }
+
         return missingValue;
     }