remove language setting

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -1953,9 +1953,7 @@ private void updateConfig(int selectedVersion) throws IOException {
         if (selectedVersion == 146) {
             // Updater set it to true because plugin upgrading
             // Default configuration disable it cause probably fresh install
-            if (StringUtils.isEmpty(getConfiguration().getString("language"))) {
-                getConfiguration().set("language", "en_us");
-            }
+            getConfiguration().set("language", null);
             getConfiguration().set("config-version", ++selectedVersion);
         }
         if (getConfiguration().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {

src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java

@@ -391,14 +391,14 @@ private List<String> postProcess(@NotNull List<String> text) {
         public List<String> forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
-                if (plugin.getConfiguration().getString("language").equals(locale)) {
+                if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     List<String> str = fallbackLocal();
                     if (str.isEmpty()) {
                         return Collections.singletonList("Fallback Missing Language Key: " + path + ", report to QuickShop!");
                     }
                     return postProcess(str);
                 } else {
-                    return forLocale(plugin.getConfiguration().getString("language"));
+                    return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
                 }
             } else {
                 List<String> str = index.getStringList(path);
@@ -422,7 +422,7 @@ public List<String> forLocale() {
             if (sender instanceof Player) {
                 return forLocale(((Player) sender).getLocale());
             } else {
-                return forLocale(plugin.getConfiguration().getString("language"));
+                return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
             }
         }
 
@@ -508,14 +508,14 @@ private String postProcess(@NotNull String text) {
         public String forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
-                if (plugin.getConfiguration().getString("language").equals(locale)) {
+                if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     String str = fallbackLocal();
                     if (str == null) {
                         return "Fallback Missing Language Key: " + path + ", report to QuickShop!";
                     }
                     return postProcess(str);
                 } else {
-                    return forLocale(plugin.getConfiguration().getString("language"));
+                    return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
                 }
             } else {
                 String str = index.getString(path);
@@ -537,7 +537,7 @@ public String forLocale() {
             if (sender instanceof Player) {
                 return forLocale(((Player) sender).getLocale());
             } else {
-                return forLocale(plugin.getConfiguration().getString("language"));
+                return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
             }
         }
 

src/main/resources/config.yml

@@ -3,9 +3,6 @@
 #Do not touch this if you don't know what you're doing!
 config-version: 147
 
-#This option used for sign text and language fallback
-language: en_us
-
 #This language will used by Item Name, Enchantment Name,
 #and Potion Effect Name or the text on the shop info sign (nbtapi not installed) and other them related position.
 #Use default will use your system language.