refactor: update locales

src_data/locales/cn.json

@@ -8,13 +8,18 @@
       "issues": "问题与反馈",
       "releases": "发行版"
     },
-    "dbm": "dBm",
+    "units": {
-    "kw": "kW",
-    "time": {
       "days": "天",
       "hours": "小时",
       "min": "分",
-      "sec": "秒"
+      "sec": "秒",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
 
     "button": {
@@ -51,7 +56,8 @@
         },
         "uptime": "运行时间",
         "memory": {
-          "title": "可用内存",
+          "heap": "Heap",
+          "psram": "Psram",
           "maxFreeBlock": "max free block",
           "min": "min"
         },
@@ -120,6 +126,7 @@
         "mHeatEnabled": "供暖功能已启用",
         "mHeatBlocking": "供暖",
         "mHeatOverheat": "供暖超热保护",
+        "mHeatFreezing": "防冻保护",
         "sHeatActive": "供暖激活状态",
         "mHeatSetpointTemp": "供暖供水设定温度",
         "mHeatTargetTemp": "供暖供水目标温度",

src_data/locales/en.json

@@ -8,13 +8,18 @@
       "issues": "Issues & questions",
       "releases": "Releases"
     },
-    "dbm": "dBm",
+    "units": {
-    "kw": "kW",
-    "time": {
       "days": "d.",
       "hours": "h.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
 
     "button": {
@@ -51,7 +56,8 @@
         },
         "uptime": "Uptime",
         "memory": {
-          "title": "Free memory",
+          "heap": "Heap",
+          "psram": "Psram",
           "maxFreeBlock": "max free block",
           "min": "min"
         },

src_data/locales/it.json

@@ -8,13 +8,18 @@
       "issues": "Problemi e domande",
       "releases": "Versione"
     },
-    "dbm": "dBm",
+    "units": {
-    "kw": "kW",
-    "time": {
       "days": "d.",
       "hours": "h.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
 
     "button": {
@@ -51,7 +56,8 @@
         },
         "uptime": "Tempo di attività",
         "memory": {
-          "title": "Memoria libera",
+          "heap": "Heap",
+          "psram": "Psram",
           "maxFreeBlock": "max free block",
           "min": "min"
         },
@@ -120,6 +126,7 @@
         "mHeatEnabled": "Riscaldamento attivato",
         "mHeatBlocking": "Riscaldamento bloccato",
         "mHeatOverheat": "Riscaldamento surriscaldamento",
+        "mHeatFreezing": "Protezione antigelo",
         "sHeatActive": "Riscaldamento attivo",
         "mHeatSetpointTemp": "Temp riscaldamento impostato",
         "mHeatTargetTemp": "Target Temp caldaia",

src_data/locales/nl.json

@@ -8,13 +8,18 @@
       "issues": "Problemen & vragen",
       "releases": "Releases"
     },
-    "dbm": "dBm",
+    "units": {
-    "kw": "kW",
-    "time": {
       "days": "d.",
       "hours": "u.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
     "button": {
       "upgrade": "Upgraden",
@@ -47,7 +52,8 @@
         },
         "uptime": "Uptime",
         "memory": {
-          "title": "Vrij geheugen",
+          "heap": "Heap",
+          "psram": "Psram",
           "maxFreeBlock": "max. vrij blok",
           "min": "min"
         },
@@ -109,6 +115,7 @@
         "mHeatEnabled": "Verwarming ingeschakeld",
         "mHeatBlocking": "Verwarming geblokkeerd",
         "mHeatOverheat": "Verwarming oververhit",
+        "mHeatFreezing": "Verwarming vorstbescherming",
         "sHeatActive": "Verwarming actief",
         "mHeatSetpointTemp": "Insteltemperatuur verwarming",
         "mHeatTargetTemp": "Doeltemperatuur verwarming",

src_data/locales/ru.json

@@ -8,13 +8,19 @@
       "issues": "Проблемы и вопросы",
       "releases": "Релизы"
     },
-    "dbm": "дБм",
+
-    "kw": "кВт",
+    "units": {
-    "time": {
       "days": "д.",
       "hours": "ч.",
       "min": "мин.",
-      "sec": "сек."
+      "sec": "сек.",
+      "dbm": "дБм",
+      "mhz": "МГц",
+      "kw": "кВт",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "байт",
+      "mbyte": "мбайт"
     },
 
     "button": {
@@ -51,7 +57,8 @@
         },
         "uptime": "Аптайм",
         "memory": {
-          "title": "ОЗУ",
+          "heap": "Heap",
+          "psram": "Psram",
           "maxFreeBlock": "макс. блок",
           "min": "мин."
         },
@@ -120,6 +127,7 @@
         "mHeatEnabled": "Отопление",
         "mHeatBlocking": "Блокировка отопления",
         "mHeatOverheat": "Отопление, перегрев",
+        "mHeatFreezing": "Отопление, защита от замерзания",
         "sHeatActive": "Активность отопления",
         "mHeatSetpointTemp": "Отопление, уставка",
         "mHeatTargetTemp": "Отопление, целевая температура",

src_data/pages/dashboard.html

@@ -769,7 +769,7 @@
               }
 
               if (sData.rssi !== undefined) {
-                appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: <b>${sData.rssi.toFixed(0)}</b> ${i18n('dbm')}`, `<br />`, sensorNode);
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: <b>${sData.rssi.toFixed(0)}</b> ${i18n('units.dbm')}`, `<br />`, sensorNode);
               }
             }
 

src_data/pages/index.html

@@ -113,25 +113,32 @@
               <tr>
                 <th scope="row" data-i18n>index.system.uptime</th>
                 <td>
-                  <b id="uptime-days"></b> <span data-i18n>time.days</span>, 
+                  <b id="uptime-days"></b> <span data-i18n>units.days</span>, 
-                  <b id="uptime-hours"></b> <span data-i18n>time.hours</span>, 
+                  <b id="uptime-hours"></b> <span data-i18n>units.hours</span>, 
-                  <b id="uptime-min"></b> <span data-i18n>time.min</span>, 
+                  <b id="uptime-min"></b> <span data-i18n>units.min</span>, 
-                  <b id="uptime-sec"></b> <span data-i18n>time.sec</span>
+                  <b id="uptime-sec"></b> <span data-i18n>units.sec</span>
                 </td>
               </tr>
               <tr>
-                <th scope="row" data-i18n>index.system.memory.title</th>
+                <th scope="row" data-i18n>index.system.memory.heap</th>
                 <td>
-                  <b id="heap-free"></b> of <b id="heap-total"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-free"></b> bytes)<br />
+                  <b id="heap-free"></b> of <b id="heap-total"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-free"></b> <span data-i18n>units.byte</span>)<br />
-                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="heap-max-free-block"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-max-free-block"></b> bytes)
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="heap-max-free-block"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-max-free-block"></b> <span data-i18n>units.byte</span>)
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.memory.psram</th>
+                <td>
+                  <b id="psram-free"></b> of <b id="psram-total"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="psram-min-free"></b> <span data-i18n>units.byte</span>)<br />
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="psram-max-free-block"></b> <span data-i18n>units.byte</span>
                 </td>
               </tr>
               <tr>
                 <th scope="row" data-i18n>index.system.board</th>
                 <td>
                   <span data-i18n>index.system.chip.model</span>: <b id="chip-model"></b> (rev. <span id="chip-rev"></span>)<br />
-                  <span data-i18n>index.system.chip.cores</span>: <b id="chip-cores"></b>, <span data-i18n>index.system.chip.freq</span>: <b id="chip-freq"></b> mHz<br />
+                  <span data-i18n>index.system.chip.cores</span>: <b id="chip-cores"></b>, <span data-i18n>index.system.chip.freq</span>: <b id="chip-freq"></b> <span data-i18n>units.mhz</span><br />
-                  <span data-i18n>index.system.flash.size</span>: <b id="flash-size"></b> MB (<span data-i18n>index.system.flash.realSize</span>: <b id="flash-real-size"></b> MB)
+                  <span data-i18n>index.system.flash.size</span>: <b id="flash-size"></b> <span data-i18n>units.mbyte</span> (<span data-i18n>index.system.flash.realSize</span>: <b id="flash-real-size"></b> <span data-i18n>units.mbyte</span>)
                 </td>
               </tr>
               <tr>
@@ -219,6 +226,11 @@
             setValue('#heap-max-free-block', result.heap.maxFreeBlock);
             setValue('#heap-min-max-free-block', result.heap.minMaxFreeBlock);
 
+            setValue('#psram-total', result.psram.total);
+            setValue('#psram-free', result.psram.free);
+            setValue('#psram-min-free', result.psram.minFree);
+            setValue('#psram-max-free-block', result.psram.maxFreeBlock);
+
             setValue('#chip-model', result.chip.model);
             setValue('#chip-rev', result.chip.rev);
             setValue('#chip-cores', result.chip.cores);

src_data/scripts/utils.js

@@ -784,9 +784,9 @@ const purposeUnit = (purpose, unitSystem) => {
     7:    tUnit,
     8:    "%",
     248:  "%",
-    249:  i18n('kw'),
+    249:  i18n('units.kw'),
-    250:  "RPM",
+    250:  i18n('units.rpm'),
-    251:  "ppm",
+    251:  i18n('units.ppm'),
     252:  pressureUnit(unitSystem),
     253:  "%",
     254:  tUnit