Ticket #173: Thermostat view: Added translations for 'when/then'

frodeheg · May 7, 2023 · 8211716 · 8211716
1 parent e3ebf23
commit 8211716
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -532,6 +532,8 @@
     "CoolNormal": "Normal cooling",
     "CoolExpensive": "Expensive cooling",
     "CoolExtreme": "Very expensive cooling",
-    "CoolOff": "Cooling off"
+    "CoolOff": "Cooling off",
+    "whenText": "when",
+    "thenText": "then"
   }
 }
diff --git a/locales/fr.json b/locales/fr.json
@@ -532,6 +532,8 @@
     "CoolNormal": "Refroidissement normal",
     "CoolExpensive": "Refroidissement coûteux",
     "CoolExtreme": "Refroidissement très cher",
-    "CoolOff": "Refroidissement désactivé"
+    "CoolOff": "Refroidissement désactivé",
+    "whenText": "quand",
+    "thenText": "alors"
   }
 }
diff --git a/locales/nl.json b/locales/nl.json
@@ -532,6 +532,8 @@
     "CoolNormal": "Normale koeling",
     "CoolExpensive": "Dure koeling",
     "CoolExtreme": "Zeer dure koeling",
-    "CoolOff": "Koelen uitgeschakeld"
+    "CoolOff": "Koelen uitgeschakeld",
+    "whenText": "wanneer",
+    "thenText": "dan"
   }
 }
diff --git a/locales/no.json b/locales/no.json
@@ -532,6 +532,8 @@
     "CoolNormal": "Normal kjøling",
     "CoolExpensive": "Dyr kjøling",
     "CoolExtreme": "Veldig dyr kjøling",
-    "CoolOff": "Kjøling av"
+    "CoolOff": "Kjøling av",
+    "whenText": "når",
+    "thenText": "så"
   }
 }
diff --git a/settings/subpages/schedule.html b/settings/subpages/schedule.html
@@ -292,6 +292,8 @@
     <div style="display:none" data-i18n="thermostat.CoolExpensive" id="CoolExpensiveText"></div>
     <div style="display:none" data-i18n="thermostat.CoolExtreme" id="CoolExtremeText"></div>
     <div style="display:none" data-i18n="thermostat.CoolOff" id="CoolOffText"></div>
+    <div style="display:none" data-i18n="thermostat.whenText" id="whenText"></div>
+    <div style="display:none" data-i18n="thermostat.thenText" id="thenText"></div>
 
     <!-- Help dialog -->
     <div id="helpPage" class="helpBg" onclick="helpOff()">
@@ -1215,6 +1217,8 @@ <h3>Time Schedule Preview</h3>
           onOffOp === DEVICE_OP.IGNORE
           || onOffOp === DEVICE_OP.UNCONDITIONAL_ON; // (None for on/off)
           //onOffOp === DEVICE_OP.CONTROLLED_ON    => Temp (onoff else)
+        const whenText = document.getElementById("whenText").innerHTML;
+        const thenText = document.getElementById("thenText").innerHTML;
 
         // Dimensions
         cWidth = canvas.width;
@@ -1329,8 +1333,8 @@ <h3>Time Schedule Preview</h3>
             if (ACMode === ACMODE.PIGGY) centerText(ctx, heatText, tCenterX, tCenterY - 36*scaleFactor);
             ctx.font = `${Math.round(10*scaleFactor*10)/10}px Verdana`;
             const heatTriggerText = (ACMode === ACMODE.PIGGY) ? `< ${heatTrigger}°C` : `${heatText.toLowerCase()}`;
-            centerText(ctx, `when ${heatTriggerText}`, tCenterX, tCenterY - 22*scaleFactor);
-            centerText(ctx, `then ${text}°C`, tCenterX, tCenterY - 8*scaleFactor);
+            centerText(ctx, `${whenText} ${heatTriggerText}`, tCenterX, tCenterY - 22*scaleFactor);
+            centerText(ctx, `${thenText} ${text}°C`, tCenterX, tCenterY - 8*scaleFactor);
           } else {
             centerText(ctx, heatText, tCenterX, tCenterY - 30*scaleFactor);
             centerText(ctx, `${text}°C`, tCenterX, tCenterY - 10*scaleFactor);
@@ -1392,8 +1396,8 @@ <h3>Time Schedule Preview</h3>
             if (ACMode === ACMODE.PIGGY) centerText(ctx, coolText, tCenterX, tCenterY + 38*scaleFactor);
             ctx.font = `${Math.round(10*scaleFactor*10)/10}px Verdana`;
             const coolTriggerText = (ACMode === ACMODE.PIGGY) ? `> ${coolTrigger}°C` : `${coolText.toLowerCase()}`;
-            centerText(ctx, `when ${coolTriggerText}`, tCenterX, tCenterY + 8*scaleFactor);
-            centerText(ctx, `then ${text}°C`, tCenterX, tCenterY + 22*scaleFactor);
+            centerText(ctx, `${whenText} ${coolTriggerText}`, tCenterX, tCenterY + 8*scaleFactor);
+            centerText(ctx, `${thenText} ${text}°C`, tCenterX, tCenterY + 22*scaleFactor);
           } else {
             centerText(ctx, coolText, tCenterX, tCenterY + 30*scaleFactor);
             centerText(ctx, `${text}°C`, tCenterX, tCenterY + 10*scaleFactor);
@@ -1418,7 +1422,7 @@ <h3>Time Schedule Preview</h3>
           ctx.fill();
         }
         // Switch mode indicators:
-        if (showCool && showHeat) {
+        if (showCool && showHeat && ACMode === ACMODE.PIGGY) {
           focusText = '‣';
           ctx.fillStyle = `#800${(focus === 2) ? '1' : '4'}`;
           centerAngle = tempToAngle(markerStartPos, markerEndPos, startTemp, endTemp, heatTrigger);