Merge pull request CleverRaven#53119 from BrettDong/lang

Improve 3rd party mods compatibility in the new translation template generator

lang/string_extractor/parse.py

@@ -12,7 +12,12 @@ def parse_json_object(json, origin):
     if "type" in json and type(json["type"]) is str:
         json_type = json["type"].lower()
         if json_type in parsers:
-            parsers[json_type](json, origin)
+            try:
+                parsers[json_type](json, origin)
+            except Exception as E:
+                print("Exception when parsing JSON data type \"{}\""
+                      .format(json_type))
+                raise E
         else:
             raise Exception("Unrecognized JSON data type \"{}\""
                             .format(json_type))

lang/string_extractor/parsers/npc_class.py

@@ -4,8 +4,14 @@
 
 def parse_npc_class(json, origin):
     comment = json.get("//", None)
-    name = get_singular_name(json["name"])
-    write_text(json["name"], origin, comment=["Name of an NPC class", comment])
-    write_text(json["job_description"], origin,
-               comment=["Job description of \"{}\" NPC class".format(name),
-                        comment])
+    name = ""
+    if "name" in json:
+        name = get_singular_name(json["name"])
+        write_text(json["name"], origin,
+                   comment=["Name of an NPC class", comment])
+    elif "id" in json:
+        name = json["id"]
+    if "job_description" in json:
+        write_text(json["job_description"], origin,
+                   comment=["Job description of \"{}\" NPC class".format(name),
+                            comment])

lang/string_extractor/parsers/profession.py

@@ -4,7 +4,9 @@
 def parse_profession(json, origin):
     name_male = ""
     name_female = ""
-    if type(json["name"]) is dict:
+    if "name" not in json:
+        name_male = name_female = json["id"]
+    elif type(json["name"]) is dict:
         name_male = json["name"]["male"]
         name_female = json["name"]["female"]
     elif type(json["name"]) is str:

lang/string_extractor/parsers/speech.py

@@ -2,7 +2,12 @@
 
 
 def parse_speech(json, origin):
-    speaker = ", ".join(json.get("speaker", []))
+    speaker = ""
+    if "speaker" in json:
+        if type(json["speaker"]) is list:
+            speaker = ", ".join(json.get("speaker", []))
+        elif type(json["speaker"]) is str:
+            speaker = json["speaker"]
     if "sound" in json:
         write_text(json["sound"], origin, c_format=False,
                    comment="Speech from speaker {}".format(speaker))