Merge branch 'iNavFlight:master' into language_specific_font

iNavFlight · Dec 13, 2024 · 986ae1b · 986ae1b
2 parents 1e2da77 + 56e5656
commit 986ae1b
Show file tree

Hide file tree

Showing 10 changed files with 6,405 additions and 38 deletions.
diff --git a/js/data_storage.js b/js/data_storage.js
@@ -2,7 +2,7 @@
 
 var CONFIGURATOR = {
      // all versions are specified and compared using semantic versioning http://semver.org/
-    'minfirmwareVersionAccepted': '7.0.0',
+    'minfirmwareVersionAccepted': '8.0.0',
     'maxFirmwareVersionAccepted': '9.0.0', // Condition is < (lt) so we accept all in 8.x branch
     'connectionValid': false,
     'connectionValidCliOnly': false,

diff --git a/js/localization.js b/js/localization.js
@@ -10,7 +10,7 @@ const i18nextXHRBackend = require('i18next-xhr-backend');
 const Store = require('electron-store');
 const store = new Store();
 
-const availableLanguages = ['en', 'uk'];
+const availableLanguages = ['en', 'uk','zh_CN'];
 
 const i18n = {};
 

diff --git a/js/ublox/UBLOX.js b/js/ublox/UBLOX.js
@@ -154,7 +154,11 @@ var ublox = (function () {
 
         if (successCallback != null) {
             req.onload = (event) => {
-                successCallback(req.response);
+                if(req.status == 200) {
+                    successCallback(req.response);
+                } else {
+                    failCallback(event);
+                }
             };
         }
 
@@ -164,13 +168,17 @@ var ublox = (function () {
             }
         }
 
-        req.send(null);
+        try {
+            req.send(null);
+        } catch(error) {
+            GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
+            console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + error.toString());
+        }
     }
 
 
     function loadError(event) {
         GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
-        console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event.toString());
     }
 
     // For more info on assistnow, check:

diff --git a/locale/en/messages.json b/locale/en/messages.json
@@ -14,6 +14,10 @@
         "message": "українська",
         "_comment": "Don't translate!"
     },
+    "language_zh_CN": {
+        "message": "简体中文",
+        "_comment": "Don't translate!"
+    },
     "language": {
         "message": "Language"
     },

diff --git a/locale/uk/messages.json b/locale/uk/messages.json