Merge pull request #8798 from DonLakeFlyer/JsonLocParser

Fix json loc parser

translations/qgc-json.ts

+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>SubmarineFact.json</name>
     <message>
@@ -3343,9 +3346,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <extracomment>.QGC.MetaData.Facts[language].shortDescription, </extracomment>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>
-        <source>Language</source>
+        <source>If enabled the throttle stick will snap back to center when released.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3354,6 +3357,12 @@
         <source>Indoor,Outdoor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Auto-Center Throttle</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <extracomment>.QGC.MetaData.Facts[showLargeCompass].longDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>
@@ -3426,6 +3435,12 @@
         <source>This value defines the default speed for calculating mission statistics for multi-rotor vehicles or VTOL vehicle in multi-rotor mode. It does not modify the flight speed for a specific flight plan.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[language].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>
@@ -3480,12 +3495,6 @@
         <source>If this option is enabled the preflight checklist must pass before arming.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <extracomment>.QGC.MetaData.Facts[virtualJoystickCentralized].longDescription, </extracomment>
-        <location filename="../src/Settings/App.SettingsGroup.json"/>
-        <source>If this option is enabled the virtual joystick throttle stick will be centralized.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>
@@ -3685,9 +3694,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <extracomment>.QGC.MetaData.Facts[virtualJoystickCentralized].shortDescription, </extracomment>
+        <extracomment>.QGC.MetaData.Facts[indoorPalette].longDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>
-        <source>Set virtual joystick to be centralize throttle (spring-loaded).</source>
+        <source>The color scheme for the user interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3702,12 +3711,6 @@
         <source>This value defines the default speed for calculating mission statistics for vehicles which do not support hover or VTOL vehicles in fixed wing mode. It does not modify the flight speed for a specific flight plan.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <extracomment>.QGC.MetaData.Facts[indoorPalette].longDescription, </extracomment>
-        <location filename="../src/Settings/App.SettingsGroup.json"/>
-        <source>The color scheme for the user interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <extracomment>.QGC.MetaData.Facts[enableTaisyncVideo].shortDescription, .QGC.MetaData.Facts[enableTaisyncVideo].longDescription, </extracomment>
         <location filename="../src/Settings/App.SettingsGroup.json"/>

translations/qgc-lupdate-json.py

@@ -88,6 +88,9 @@ def walkDirectoryTreeForJsonFiles(dir, multiFileLocArray):
 
 def writeJsonTSFile(multiFileLocArray):
     jsonTSFile = codecs.open('qgc-json.ts', 'w', "utf-8")
+    jsonTSFile.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+    jsonTSFile.write("<!DOCTYPE TS>\n")
+    jsonTSFile.write("<TS version=\"2.1\">\n")
     for entry in multiFileLocArray:
         jsonTSFile.write("<context>\n")
         jsonTSFile.write("    <name>%s</name>\n" % entry[0])