Merge branch 'master' into ToshihiroMakuuchi/ja-fix01

iNavFlight · Dec 13, 2024 · 5f25766 · 5f25766
2 parents 88fbdef + f454d6e
commit 5f25766
Show file tree

Hide file tree

Showing 19 changed files with 6,549 additions and 73 deletions.
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html i18n_lang="currentLanguage">
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -88,13 +88,7 @@ <h1 class="modal__title modal__title" data-i18n="appUpdateNotificationHeader"></
                 </div>
             </div>
             <div class="header-wrapper">
-                <div id="dataflash_wrapper_global">
-                    <div class="noflash_global" align="center" i18n="sensorDataFlashNotFound"></div>
-                    <ul class="dataflash-contents_global">
-                        <li class="dataflash-free_global">
-                            <div class="legend" i18n="sensorDataFlashFreeSpace"></div>
-                        </li>
-                    </ul>
+                <div id="profiles_wrapper_global">
                     <div id="profile_change">
                         <div class="dropdown dropdown-dark">
                             <form name="profile-change" id="profile-change">
@@ -130,6 +124,14 @@ <h1 class="modal__title modal__title" data-i18n="appUpdateNotificationHeader"></
                         </div>
                     </div>
                 </div>
+                <div id="dataflash_wrapper_global">
+                    <div class="noflash_global" align="center" i18n="sensorDataFlashNotFound"></div>
+                    <ul class="dataflash-contents_global">
+                        <li class="dataflash-free_global">
+                            <div class="legend" i18n="sensorDataFlashFreeSpace"></div>
+                        </li>
+                    </ul>
+                </div>
                 <div id="sensor-status" class="sensor_state mode-connected">
                     <ul>
                         <li class="gyro" i18n_title="sensorStatusGyro">

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/gui.js b/js/gui.js
@@ -529,7 +529,7 @@ GUI_control.prototype.update_dataflash_global = function () {
         width: (100-(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize) / FC.DATAFLASH.totalSize * 100) + "%",
         display: 'block'
         });
-        $(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize));
+        $(".dataflash-free_global div").html(i18n.getMessage('sensorDataFlashFreeSpace') + formatFilesize(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize));
     } else {
         $(".noflash_global").css({
         display: 'block'

diff --git a/js/localization.js b/js/localization.js
@@ -10,7 +10,8 @@ const i18nextXHRBackend = require('i18next-xhr-backend');
 const Store = require('electron-store');
 const store = new Store();
 
-const availableLanguages = ['en', 'ja', 'uk'];
+
+const availableLanguages = ['en', 'ja', 'uk','zh_CN'];
 
 const i18n = {};
 
@@ -173,6 +174,11 @@ i18n.localize = function (reTranslate = false) {
             const element = $(this);
             element.attr('placeholder', translate(element.attr('i18n_placeholder')));
         });
+
+        $('[i18n_lang]').each(function() {
+            const element = $(this);
+            element.attr('lang', translate(element.attr('i18n_lang')));
+        });
     } else {
 
         $('[i18n]:not(.i18n-replaced)').each(function() {
@@ -234,6 +240,13 @@ i18n.localize = function (reTranslate = false) {
             element.attr('placeholder', translate(element.attr('i18n_placeholder')));
             element.addClass('i18n_placeholder-replaced');
         });
+
+        $('[i18n_lang]:not(.i18n_lang-replaced)').each(function() {
+            const element = $(this);
+            element.attr('lang', translate(element.attr('i18n_lang')));
+            element.addClass('i18n_lang-replaced');
+        });
+
     }
 
     return localized;

diff --git a/js/serial_backend.js b/js/serial_backend.js
@@ -462,6 +462,7 @@ var SerialBackend = (function () {
             $('#sensor-status').show();
             $('#portsinput').hide();
             $('#dataflash_wrapper_global').show();
+            $('#profiles_wrapper_global').show();
 
             /*
             * Init PIDs bank with a length that depends on the version
@@ -481,7 +482,6 @@ var SerialBackend = (function () {
 
             interval.add('global_data_refresh', periodicStatusUpdater.run, periodicStatusUpdater.getUpdateInterval(CONFIGURATOR.connection.bitrate), false);
         });
-
     }
 
     privateScope.onClosed = function (result) {
@@ -497,6 +497,7 @@ var SerialBackend = (function () {
         $('#sensor-status').hide();
         $('#portsinput').show();
         $('#dataflash_wrapper_global').hide();
+        $('#profiles_wrapper_global').hide();
         $('#quad-status_wrapper').hide();
 
         //updateFirmwareVersion();

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
@@ -18,6 +18,10 @@
         "message": "日本語",
         "_comment": "Don't translate!"
     },    
+    "language_zh_CN": {
+        "message": "简体中文",
+        "_comment": "Don't translate!"
+    },
     "language": {
         "message": "Language"
     },
@@ -5704,7 +5708,7 @@
         "message": "No dataflash <br>chip found"
     },
     "sensorDataFlashFreeSpace": {
-        "message": "Dataflash: free space"
+        "message": "Dataflash: <br />free "
     },
     "mixerProfile1": {
         "message": "Mixer Profile 1"
@@ -6156,5 +6160,8 @@
     },
     "adsbHeartbeatTotalMessages": {
         "message": "Heartbeat msgs"
+    },
+    "currentLanguage": {
+        "message": "en"
     }
 }