Merge branch 'master' of https://github.com/pyfa-org/Pyfa

scripts/jsonToSql.py

@@ -126,7 +126,7 @@ def main(db, json_path):
         for row in data:
             typeLines = []
             typeId = row["typeID"]
-            traitData = row["traits_en-us"]
+            traitData = row["traits"]
             for skillData in sorted(traitData.get("skills", ()), key=lambda i: i["header"]):
                 typeLines.append(convertSection(skillData))
             if "role" in traitData:

scripts/prep_data.py

@@ -82,7 +82,7 @@ if not args.nojson:
            "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\
            "evegroups,evetypes,evecategories,marketProxy()_GetMarketGroups()"
 
-    FlowManager(miners, writers).run(list, "multi")
+    FlowManager(miners, writers).run(list, "en-us")
 
 ### SQL Convert
 import jsonToSql