Add icon translations to Melnor (home-assistant#111906)

* Use default icon for Melnor * Use default icon for Melnor
dmulcahey · Mar 3, 2024 · 3c960b7 · 3c960b7
1 parent ec1400d
commit 3c960b7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/homeassistant/components/melnor/icons.json b/homeassistant/components/melnor/icons.json
@@ -0,0 +1,23 @@
+{
+  "entity": {
+    "number": {
+      "manual_minutes": {
+        "default": "mdi:timer-cog-outline"
+      },
+      "frequency_interval_hours": {
+        "default": "mdi:calendar-refresh-outline"
+      },
+      "frequency_duration_minutes": {
+        "default": "mdi:timer-outline"
+      }
+    },
+    "switch": {
+      "manual": {
+        "default": "mdi:sprinkler"
+      },
+      "frequency": {
+        "default": "mdi:calendar-sync-outline"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/melnor/number.py b/homeassistant/components/melnor/number.py
@@ -46,7 +46,6 @@ class MelnorZoneNumberEntityDescription(
         entity_category=EntityCategory.CONFIG,
         native_max_value=360,
         native_min_value=1,
-        icon="mdi:timer-cog-outline",
         key="manual_minutes",
         translation_key="manual_minutes",
         native_unit_of_measurement=UnitOfTime.MINUTES,
@@ -57,7 +56,6 @@ class MelnorZoneNumberEntityDescription(
         entity_category=EntityCategory.CONFIG,
         native_max_value=168,
         native_min_value=1,
-        icon="mdi:calendar-refresh-outline",
         key="frequency_interval_hours",
         translation_key="frequency_interval_hours",
         native_unit_of_measurement=UnitOfTime.HOURS,
@@ -68,7 +66,6 @@ class MelnorZoneNumberEntityDescription(
         entity_category=EntityCategory.CONFIG,
         native_max_value=360,
         native_min_value=1,
-        icon="mdi:timer-outline",
         key="frequency_duration_minutes",
         translation_key="frequency_duration_minutes",
         native_unit_of_measurement=UnitOfTime.MINUTES,

diff --git a/homeassistant/components/melnor/switch.py b/homeassistant/components/melnor/switch.py
@@ -43,15 +43,14 @@ class MelnorSwitchEntityDescription(
 ZONE_ENTITY_DESCRIPTIONS = [
     MelnorSwitchEntityDescription(
         device_class=SwitchDeviceClass.SWITCH,
-        icon="mdi:sprinkler",
         key="manual",
+        translation_key="manual",
         name=None,
         on_off_fn=lambda valve, bool: valve.set_is_watering(bool),
         state_fn=lambda valve: valve.is_watering,
     ),
     MelnorSwitchEntityDescription(
         device_class=SwitchDeviceClass.SWITCH,
-        icon="mdi:calendar-sync-outline",
         key="frequency",
         translation_key="frequency",
         on_off_fn=lambda valve, bool: valve.set_frequency_enabled(bool),

diff --git a/tests/components/melnor/test_number.py b/tests/components/melnor/test_number.py
@@ -29,7 +29,6 @@ async def test_manual_watering_minutes(hass: HomeAssistant) -> None:
         assert number.attributes["max"] == 360
         assert number.attributes["min"] == 1
         assert number.attributes["step"] == 1.0
-        assert number.attributes["icon"] == "mdi:timer-cog-outline"
 
         assert device.zone1.manual_watering_minutes == 0
 
@@ -65,7 +64,6 @@ async def test_frequency_interval_hours(hass: HomeAssistant) -> None:
         assert number.attributes["max"] == 168
         assert number.attributes["min"] == 1
         assert number.attributes["step"] == 1.0
-        assert number.attributes["icon"] == "mdi:calendar-refresh-outline"
 
         assert device.zone1.frequency.interval_hours == 0
 
@@ -101,7 +99,6 @@ async def test_frequency_duration_minutes(hass: HomeAssistant) -> None:
         assert number.attributes["max"] == 360
         assert number.attributes["min"] == 1
         assert number.attributes["step"] == 1.0
-        assert number.attributes["icon"] == "mdi:timer-outline"
 
         assert device.zone1.frequency.duration_minutes == 0
 

diff --git a/tests/components/melnor/test_switch.py b/tests/components/melnor/test_switch.py
@@ -26,7 +26,6 @@ async def test_manual_watering_switch_metadata(hass: HomeAssistant) -> None:
 
         assert switch is not None
         assert switch.attributes["device_class"] == SwitchDeviceClass.SWITCH
-        assert switch.attributes["icon"] == "mdi:sprinkler"
 
 
 async def test_manual_watering_switch_on_off(hass: HomeAssistant) -> None: