Fix TextManager

Author: Ghost-chu

pom.xml

@@ -975,6 +975,13 @@
             <version>4.9.1</version>
             <scope>compile</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>

src/main/java/org/maxgamer/quickshop/util/language/text/TextManager.java

@@ -1,6 +1,7 @@
 package org.maxgamer.quickshop.util.language.text;
 
 import com.dumptruckman.bukkit.configuration.json.JsonConfiguration;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -20,7 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.logging.Level;
@@ -49,9 +50,8 @@ public void load() {
         postProcessors.clear();
         // Load mapping
         //for (String availableFile : distribution.getAvailableFiles()) {
-        try (InputStream stream = plugin.getResource("lang-original/messages.json")) {
-            if (stream != null)
-                bundledLang.loadFromString(new String(Util.inputStream2ByteArray(stream), StandardCharsets.UTF_8));
+        try {
+            bundledLang.loadFromString(new String(IOUtils.toByteArray(new InputStreamReader(plugin.getResource("lang-original/messages.json")), StandardCharsets.UTF_8)));
         } catch (IOException | InvalidConfigurationException ex) {
             bundledLang = new JsonConfiguration();
             plugin.getLogger().log(Level.SEVERE,"Cannot load bundled language file from Jar, some strings may missing!",ex);
@@ -169,17 +169,24 @@ private List<String> postProcess(@NotNull List<String> text) {
         @NotNull
         public List<String> forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
-            if (index == null && locale.equals("en")) {
-                List<String> str = fallbackLocal();
-                if (str.isEmpty())
-                    return Collections.singletonList("Fallback Missing Language Key: " + path + ", report to QuickShop!");
+            if(index == null){
+                if(locale.equals("en-US")){
+                    List<String> str = fallbackLocal();
+                    if (str.isEmpty())
+                        return Collections.singletonList("Fallback Missing Language Key: " + path + ", report to QuickShop!");
+                    return postProcess(str);
+                }else{
+                    return forLocale("en-US");
+                }
+            }else{
+                List<String> str = index.getStringList(locale);
+                if(str.isEmpty()) {
+                    return Collections.singletonList("Missing Language Key: " + path);
+                }else {
+                    return postProcess(str);
+                }
             }
-            if (index == null)
-                return forLocale("en");
-            List<String> str = index.getStringList(locale);
-            if (str.isEmpty())
-                return Collections.singletonList("Missing Language Key: " + path);
-            return postProcess(str);
+
         }
 
         @NotNull
@@ -246,25 +253,29 @@ private String postProcess(@NotNull String text) {
         @NotNull
         public String forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
-            if (index == null && locale.equals("en")) {
-                String str = fallbackLocal();
+            if(index == null){
+                if(locale.equals("en-US")){
+                    String str = fallbackLocal();
+                    if (str == null)
+                        return "Fallback Missing Language Key: " + path + ", report to QuickShop!";
+                    return postProcess(str);
+                }else{
+                    return forLocale("en-US");
+                }
+            }else{
+                String str = index.getString(locale);
                 if (str == null)
-                    return "Fallback Missing Language Key: " + path + ", report to QuickShop!";
+                    return "Missing Language Key: " + path;
+                return postProcess(str);
             }
-            if (index == null)
-                return forLocale("en");
-            String str = index.getString(locale);
-            if (str == null)
-                return "Missing Language Key: " + path;
-            return postProcess(str);
         }
 
         @NotNull
         public String forLocale() {
             if (sender instanceof Player) {
                 return forLocale(((Player) sender).getLocale());
             } else {
-                return forLocale("en");
+                return forLocale("en-US");
             }
         }