Don't override en-us gacha strings with vietnamese

Birdulon · Oct 28, 2022 · d7af52f · d7af52f
1 parent c21d216
commit d7af52f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -232,10 +232,14 @@ public static List<String> createGachaMappingJsons() {
     public static void createGachaMappings(Path location) throws IOException {
         ResourceLoader.loadResources();
         List<String> jsons = createGachaMappingJsons();
+        var usedLocales = new HashSet<String>();
         StringBuilder sb = new StringBuilder("mappings = {\n");
         for (int i = 0; i < Language.TextStrings.NUM_LANGUAGES; i++) {
-            sb.append("\t\"%s\": ".formatted(Language.TextStrings.ARR_GC_LANGUAGES[i].toLowerCase()));  // TODO: change the templates to not use lowercased locale codes
-            sb.append(jsons.get(i).replace("\n", "\n\t") + ",\n");
+            String locale = Language.TextStrings.ARR_GC_LANGUAGES[i].toLowerCase();  // TODO: change the templates to not use lowercased locale codes
+            if (usedLocales.add(locale)) {  // Some locales fallback to en-us, we don't want to redefine en-us with vietnamese strings
+                sb.append("\t\"%s\": ".formatted(locale));
+                sb.append(jsons.get(i).replace("\n", "\n\t") + ",\n");
+            }
         }
         sb.setLength(sb.length() - 2);  // Delete trailing ",\n"
         sb.append("\n}");