From 806cebb024eb6aa7d8e3be9be120f5f8d693b855 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 31 Aug 2023 13:06:29 +0200
Subject: [PATCH] Fix more info translation keys (#17749)

---
 .../more-info/controls/more-info-climate.ts   |  9 +++-----
 .../more-info/controls/more-info-fan.ts       | 22 ++++++++++++++-----
 .../controls/more-info-water_heater.ts        |  5 +----
 .../hui-climate-hvac-modes-tile-feature.ts    |  5 +----
 ...ter-heater-operation-modes-tile-feature.ts |  5 +----
 src/translations/en.json                      | 11 +++++-----
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts
index 3e3d4b10a4..c1e4cb0999 100644
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -142,7 +142,7 @@ class MoreInfoClimate extends LitElement {
                   .selected=${this._mainControl === "temperature"}
                   .disabled=${this.stateObj!.state === UNAVAILABLE}
                   .label=${this.hass.localize(
-                    "ui.dialogs.more_info_control.light.color"
+                    "ui.dialogs.more_info_control.climate.temperature"
                   )}
                   .control=${"temperature"}
                   @click=${this._setMainControl}
@@ -153,7 +153,7 @@ class MoreInfoClimate extends LitElement {
                   .selected=${this._mainControl === "humidity"}
                   .disabled=${this.stateObj!.state === UNAVAILABLE}
                   .label=${this.hass.localize(
-                    "ui.dialogs.more_info_control.light.color_temp"
+                    "ui.dialogs.more_info_control.climate.humidity"
                   )}
                   .control=${"humidity"}
                   @click=${this._setMainControl}
@@ -166,10 +166,7 @@ class MoreInfoClimate extends LitElement {
       </div>
       <ha-more-info-control-select-container>
         <ha-control-select-menu
-          .label=${this.hass.formatEntityAttributeName(
-            this.stateObj,
-            "hvac_mode"
-          )}
+          .label=${this.hass.localize("ui.card.climate.mode")}
           .value=${stateObj.state}
           .disabled=${this.stateObj.state === UNAVAILABLE}
           fixedMenuPosition
diff --git a/src/dialogs/more-info/controls/more-info-fan.ts b/src/dialogs/more-info/controls/more-info-fan.ts
index facbfe035f..af315e1dc8 100644
--- a/src/dialogs/more-info/controls/more-info-fan.ts
+++ b/src/dialogs/more-info/controls/more-info-fan.ts
@@ -86,7 +86,7 @@ class MoreInfoFan extends LitElement {
   }
 
   _handleOscillating(ev) {
-    const newVal = ev.target.value === "on";
+    const newVal = ev.target.value === "true";
 
     this.hass.callService("fan", "oscillate", {
       entity_id: this.stateObj!.entity_id,
@@ -269,7 +269,9 @@ class MoreInfoFan extends LitElement {
                   this.stateObj,
                   "oscillating"
                 )}
-                .value=${this.stateObj.attributes.oscillating ? "on" : "off"}
+                .value=${this.stateObj.attributes.oscillating
+                  ? "true"
+                  : "false"}
                 .disabled=${this.stateObj.state === UNAVAILABLE}
                 fixedMenuPosition
                 naturalMenuWidth
@@ -280,19 +282,27 @@ class MoreInfoFan extends LitElement {
                   slot="icon"
                   .path=${haOscillatingOff}
                 ></ha-svg-icon>
-                <ha-list-item value="on" graphic="icon">
+                <ha-list-item value="true" graphic="icon">
                   <ha-svg-icon
                     slot="graphic"
                     .path=${haOscillating}
                   ></ha-svg-icon>
-                  ${this.hass.localize("state.default.on")}
+                  ${this.hass.formatEntityAttributeValue(
+                    this.stateObj,
+                    "oscillating",
+                    true
+                  )}
                 </ha-list-item>
-                <ha-list-item value="off" graphic="icon">
+                <ha-list-item value="false" graphic="icon">
                   <ha-svg-icon
                     slot="graphic"
                     .path=${haOscillatingOff}
                   ></ha-svg-icon>
-                  ${this.hass.localize("state.default.off")}
+                  ${this.hass.formatEntityAttributeValue(
+                    this.stateObj,
+                    "oscillating",
+                    false
+                  )}
                 </ha-list-item>
               </ha-control-select-menu>
             `
diff --git a/src/dialogs/more-info/controls/more-info-water_heater.ts b/src/dialogs/more-info/controls/more-info-water_heater.ts
index 1e59453b45..d34de2195b 100644
--- a/src/dialogs/more-info/controls/more-info-water_heater.ts
+++ b/src/dialogs/more-info/controls/more-info-water_heater.ts
@@ -73,10 +73,7 @@ class MoreInfoWaterHeater extends LitElement {
         ${supportOperationMode && stateObj.attributes.operation_list
           ? html`
               <ha-control-select-menu
-                .label=${this.hass.formatEntityAttributeName(
-                  stateObj,
-                  "operation"
-                )}
+                .label=${this.hass.localize("ui.card.water_heater.mode")}
                 .value=${stateObj.state}
                 .disabled=${stateObj.state === UNAVAILABLE}
                 fixedMenuPosition
diff --git a/src/panels/lovelace/tile-features/hui-climate-hvac-modes-tile-feature.ts b/src/panels/lovelace/tile-features/hui-climate-hvac-modes-tile-feature.ts
index c04f24c102..55c6b907cf 100644
--- a/src/panels/lovelace/tile-features/hui-climate-hvac-modes-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-climate-hvac-modes-tile-feature.ts
@@ -121,10 +121,7 @@ class HuiClimateHvacModeTileFeature
           .value=${this._currentHvacMode}
           @value-changed=${this._valueChanged}
           hide-label
-          .ariaLabel=${this.hass.formatEntityAttributeName(
-            this.stateObj,
-            "hvac_mode"
-          )}
+          .ariaLabel=${this.hass.localize("ui.card.climate.mode")}
           style=${styleMap({
             "--control-select-color": color,
           })}
diff --git a/src/panels/lovelace/tile-features/hui-water-heater-operation-modes-tile-feature.ts b/src/panels/lovelace/tile-features/hui-water-heater-operation-modes-tile-feature.ts
index e537b60401..632b3ecdb5 100644
--- a/src/panels/lovelace/tile-features/hui-water-heater-operation-modes-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-water-heater-operation-modes-tile-feature.ts
@@ -125,10 +125,7 @@ class HuiWaterHeaterOperationModeTileFeature
           .value=${this._currentOperationMode}
           @value-changed=${this._valueChanged}
           hide-label
-          .ariaLabel=${this.hass.formatEntityAttributeName(
-            this.stateObj,
-            "hvac_mode"
-          )}
+          .ariaLabel=${this.hass.localize("ui.card.water_heater.mode")}
           style=${styleMap({
             "--control-select-color": color,
           })}
diff --git a/src/translations/en.json b/src/translations/en.json
index f1f5f7f1e8..216a557636 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -107,8 +107,7 @@
         "cooling": "{name} cooling",
         "high": "high",
         "low": "low",
-        "operation": "Operation",
-        "away_mode": "Away mode"
+        "mode": "Mode"
       },
       "counter": {
         "actions": {
@@ -228,8 +227,8 @@
         "currently": "Currently",
         "on_off": "On / off",
         "target_temperature": "Target temperature",
-        "operation": "Operation",
-        "away_mode": "Away mode"
+        "away_mode": "Away mode",
+        "mode": "Mode"
       },
       "weather": {
         "attributes": {
@@ -1021,7 +1020,9 @@
         "climate": {
           "target_label": "{action} to target",
           "target": "Target",
-          "humidity_target": "Humidity target"
+          "humidity_target": "Humidity target",
+          "temperature": "Temperature",
+          "humidity": "Humidity"
         },
         "humidifier": {
           "target_label": "[%key:ui::dialogs::more_info_control::climate::target_label%]",