Merge branch 'TheSuperHackers:main' into Adding-SE-entries-in-json

Author: Polypheides

Patch104pZH/Design/Scripts/str/add_str_languages.py

@@ -23,7 +23,8 @@ def startswith_nocase(s: str, startswith: str) -> bool:
     "PL:",
     "RU:",
     "AR:",
-    "UK:"
+    "UK:",
+    "SE:"
 ]
 
 class LanguageSelector:

Patch104pZH/Design/Scripts/str/find_key_conflicts.py

@@ -590,6 +590,7 @@ def run():
     ru_command_map_ini = build_abs_path("../../../GameFilesEdited/Data/Russian/CommandMap.ini")
     ar_command_map_ini = build_abs_path("../../../GameFilesEdited/Data/Arabic/CommandMap.ini")
     uk_command_map_ini = build_abs_path("../../../GameFilesEdited/Data/Ukrainian/CommandMap.ini")
+    se_command_map_ini = build_abs_path("../../../GameFilesEdited/Data/Swedish/CommandMap.ini")
 
     assert generals_str.is_file()
     assert command_set_ini.is_file()
@@ -606,6 +607,7 @@ def run():
     assert ru_command_map_ini.is_file()
     assert ar_command_map_ini.is_file()
     assert uk_command_map_ini.is_file()
+    assert se_command_map_ini.is_file()
 
     find_with(generals_str, command_set_ini, command_button_ini, us_command_map_ini, "US")
     find_with(generals_str, command_set_ini, command_button_ini, de_command_map_ini, "DE")
@@ -619,6 +621,7 @@ def run():
     find_with(generals_str, command_set_ini, command_button_ini, ru_command_map_ini, "RU")
     find_with(generals_str, command_set_ini, command_button_ini, ar_command_map_ini, "AR")
     find_with(generals_str, command_set_ini, command_button_ini, uk_command_map_ini, "UK")
+    find_with(generals_str, command_set_ini, command_button_ini, uk_command_map_ini, "SE")
 
     print(f"Finished in {timer.GetElapsedSecondsString()} s")
 

Patch104pZH/Design/Scripts/str/fix_string_errors.py

@@ -43,7 +43,8 @@ def run():
             startswith_nocase(line, "BP: \"") or
             startswith_nocase(line, "PL: \"") or
             startswith_nocase(line, "RU: \"") or
-            startswith_nocase(line, "UK: \"")):
+            startswith_nocase(line, "UK: \"") or
+            startswith_nocase(line, "SE: \"")):
             if line[5:6] != "*":
                 new_line = line[:5] + "*" + line[5:]
                 generals_str_lines[index] = new_line

Patch104pZH/Design/Scripts/str/merge_multi_str.py

@@ -29,8 +29,8 @@ def run():
     with open(generals_str_upgrade, mode="r", encoding="utf-8") as file:
         upgrade_lines = file.readlines()
 
-    #upgrade_languages = ["US:", "DE:", "FR:", "ES:", "IT:", "KO:", "ZH:", "BP:", "PL:", "RU", "AR", "UK"]
-    upgrade_languages = ["US:", "DE:", "FR:", "ES:", "IT:", "KO:", "ZH:", "BP:", "PL:", "RU"]
+    #upgrade_languages = ["US:", "DE:", "FR:", "ES:", "IT:", "KO:", "ZH:", "BP:", "PL:", "RU", "AR", "UK", "SE"]
+    upgrade_languages = ["US:", "DE:", "FR:", "ES:", "IT:", "KO:", "ZH:", "BP:", "PL:", "RU", "SE"]
     is_in_label_block = False
     label_name = ""
     sub_label_name = ""