Merge pull request #394 from cvc90/Pi.Alert-Translation-Loading-devic…

…eDetails.php Translation "Loading/Spinner" in deviceDetails.php
jokob-sk · Aug 25, 2023 · 3dca9da · 3dca9da
2 parents 5a06072 + 2b8257d
commit 3dca9da
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/front/deviceDetails.php b/front/deviceDetails.php
@@ -576,10 +576,10 @@ function speedtestcli() {
                       }, 2000);
                   </script>
 
-                  <button type="button" id="piamanualnmap_fast" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'fast')">Loading...</button>
-                  <button type="button" id="piamanualnmap_normal" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'normal')">Loading...</button>
-                  <button type="button" id="piamanualnmap_detail" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'detail')">Loading...</button>
-                  <button type="button" id="piamanualnmap_skipdiscovery" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'skipdiscovery')">Loading...</button>
+                  <button type="button" id="piamanualnmap_fast" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'fast')"><?= lang("DevDetail_Loading");?></button>
+                  <button type="button" id="piamanualnmap_normal" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'normal')"><?= lang("DevDetail_Loading");?></button>
+                  <button type="button" id="piamanualnmap_detail" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'detail')"><?= lang("DevDetail_Loading");?></button>
+                  <button type="button" id="piamanualnmap_skipdiscovery" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(document.getElementById('txtLastIP').value, 'skipdiscovery')"><?= lang("DevDetail_Loading");?></button>
 
                   <div style="text-align: left;">
                     <ul style="padding:20px;">
@@ -650,7 +650,7 @@ function manualnmapscan(targetip, mode) {
                   <div id="loading" style="display: none">
                     <div class="pa_semitransparent-panel"></div>
                     <div class="panel panel-default pa_spinner">
-                      <table><td width="130px" align="middle">Loading...</td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td></table>
+                      <table><td width="130px" align="middle"><?= lang("DevDetail_Loading");?></td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td></table>
                     </div>
                   </div>
 
@@ -1105,7 +1105,7 @@ function initializeDatatables () {
     // Processing
     'processing'  : true,
     'language'    : {
-      processing: '<table><td width="130px" align="middle">Loading...</td>'+
+      processing: '<table><td width="130px" align="middle"><?= lang("DevDetail_Loading");?></td>'+
                   '<td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw">'+
                   '</td></table>',
       emptyTable: 'No data',
@@ -1144,7 +1144,7 @@ function initializeDatatables () {
     // Processing
     'processing'  : true,
     'language'    : {
-      processing: '<table><td width="130px" align="middle">Loading...</td>'+
+      processing: '<table><td width="130px" align="middle"><?= lang("DevDetail_Loading");?></td>'+
                   '<td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw">'+
                   '</td></table>',
       emptyTable: 'No data',
@@ -1963,7 +1963,7 @@ function initTable(tableId, mac){
   // Processing
   'processing'  : true,
   'language'    : {
-      processing: '<table><td width="130px" align="middle">Loading...</td>'+
+      processing: '<table><td width="130px" align="middle"><?= lang("DevDetail_Loading");?></td>'+
                   '<td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw">'+
                   '</td></table>',
       emptyTable: 'No data',

diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json
@@ -106,6 +106,7 @@
         "Events_Table_info" : "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
         "Events_Table_nav_next" : "Nächste",
         "Events_Table_nav_prev" : "Zurück",
+	"DevDetail_Loading" : "Laden ...",
         "DevDetail_Periodselect_today" : "Heute",
         "DevDetail_Periodselect_LastWeek" : "Letzte Woche",
         "DevDetail_Periodselect_LastMonth" : "Letzter Monat",

diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
@@ -129,6 +129,7 @@
         "Events_Table_info" : "Showing _START_ to _END_ of _TOTAL_ entries",
         "Events_Table_nav_next" : "Next",
         "Events_Table_nav_prev" : "Previous",
+	"DevDetail_Loading" : "Loading...",	    
         "DevDetail_Periodselect_today" : "Today",
         "DevDetail_Periodselect_LastWeek" : "Last Week",
         "DevDetail_Periodselect_LastMonth" : "Last Month",

diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json
@@ -129,6 +129,7 @@
         "Events_Table_info" : "Mostrando el INICIO y el FINAL de TODAS las entradas",
         "Events_Table_nav_next" : "Siguiente",
         "Events_Table_nav_prev" : "Anterior",
+        "DevDetail_Loading" : "Cargando ...",        
         "DevDetail_Periodselect_today" : "Hoy",
         "DevDetail_Periodselect_LastWeek" : "La semana pasada",
         "DevDetail_Periodselect_LastMonth" : "El mes pasado",