OTA page updates

KiwiHC16 · Sep 12, 2023 · 3fb92a1 · 3fb92a1
1 parent 6dd01e4
commit 3fb92a1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/core/i18n/en_US.json b/core/i18n/en_US.json
@@ -168,6 +168,10 @@
         "Commandes": "Commands"
     },
     "plugins/Abeille/desktop/js/Abeille.js": {
+        "Mises-à-jour OTA": "OTA upgrades",
+
+        "Tcharp38: does the content of this part really works ?": "toto",
+
         "Santé Abeille": "Bee Health",
         "Support": "Support",
         "Réseau Abeille": "Bee Network",
@@ -198,5 +202,20 @@
         "Dernière comm.": "Last comm.",
         "Depuis": "Since",
         "Batterie": "Battery"
+    },
+    "plugins/Abeille/desktop/modal/Abeille-OTA.modal.php": {
+        "Mise-à-jour des équipements": "Equipments update",
+        "Firmwares disponibles": "Available firmwares",
+        "Ajouter": "Add",
+        "Ajouter un fichier OTA local": "Add a local OTA file",
+        "Fabricant": "Manuf.",
+        "Type image": "Image type",
+        "Version": "Version",
+        "Nom fichier": "File name",
+
+        "Equipements": "Equipments",
+        "Nom": "Name",
+        "Adr": "Addr",
+        "Notifier": "Notify"
     }
 }
diff --git a/desktop/modal/Abeille-OTA.modal.php b/desktop/modal/Abeille-OTA.modal.php
@@ -9,21 +9,21 @@
     // echo '<script>var js_queueCtrlToCmd = "'.$abQueues['ctrlToCmd']['id'].'";</script>'; // PHP to JS
 ?>
 <div class="col-sm-8">
-    Mise-à-jour des équipements "Over-The-Air".
+    {{Mise-à-jour des équipements}} "Over-The-Air".
     <?php
     echo '<a class="btn btn-primary btn-xs" target="_blank" href="'.urlUserMan.'/OTA.html"><i class="fas fa-book"></i> {{Documentation}}</a>';
     ?>
     <br>
-    <h3>Firmwares disponibles</h3>
-    <button type="button" onclick="uploadOta()" class="btn btn-secondary" title="Ajouter un fichier OTA local"><i class="fas fa-plus"></i> Ajouter</button>
+    <h3>{{Firmwares disponibles}}</h3>
+    <button type="button" onclick="uploadOta()" class="btn btn-secondary" title="{{Ajouter un fichier OTA local}}"><i class="fas fa-plus"></i> {{Ajouter}}</button>
 
     <?php
         // Reading available OTA firmwares
         logSetConf('Abeille');
         otaReadFirmwares();
         echo '<table id="idFwTable">';
         echo '<tbody>';
-        echo '<tr><th></th><th>Fabricant</th><th>Type image</th><th>Version</th><th>Nom fichier</th></tr>';
+        echo '<tr><th width="25px"></th><th width="80px">{{Fabricant}}</th><th width="90px">{{Type image}}</th><th width="80px">Version</th><th>{{Nom fichier}}</th></tr>';
         $rawIdx = 1;
         if (isset($GLOBALS['ota_fw'])) {
           foreach ($GLOBALS['ota_fw'] as $manufCode => $fw) {
@@ -48,10 +48,10 @@
 </div>
 
 <div class="col-sm-4">
-    <h3>Equipements</h3>
+    <h3>{{Equipements}}</h3>
     <table>
     <tbody>
-    <tr><th>Nom</th><th>Addr</th></tr>
+    <tr><th>{{Nom}}</th><th width="40px">Addr</th></tr>
     <?php
     $eqLogics = eqLogic::byType('Abeille');
     foreach ($eqLogics as $eqLogic) {
@@ -65,7 +65,7 @@
 
       echo '<tr>';
       echo '<td>'.$eqName.'</td><td>'.$eqAddr.'</td>';
-      echo '<td><button type="button" class="btn btn-secondary" onclick="notifyDevice(\''.$eqLogicId.'\', \''.$mainEP.'\')">Notifier</button></td>';
+      echo '<td><button type="button" class="btn btn-secondary" onclick="notifyDevice(\''.$eqLogicId.'\', \''.$mainEP.'\')">{{Notifier}}</button></td>';
       echo '</tr>';
     }
     ?>

diff --git a/docs/fr_FR/Changelog.rst b/docs/fr_FR/Changelog.rst
@@ -11,6 +11,7 @@ ChangeLog
 - Interne: Cmd: Mise-à-jour 'setTemperature'.
 - Interne: Parser: Correction mauvaise interprétation 'ColorTempMired' (2544).
 - Livarno Home floor lamp: Mise-à-jour du modèle (2544).
+- Page updates OTA: Améliorations aspect & traductions US.
 
 230907-BETA-2
 -------------