From b70eea7fb29446505cd76b3a3bf3f7f4a28feede Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Thu, 29 Feb 2024 16:09:47 +0100 Subject: [PATCH] Add icon translations to IPP (#111846) * Add icon translations to IPP * Add icon translations to IPP --- homeassistant/components/ipp/icons.json | 15 +++++++++++++++ homeassistant/components/ipp/sensor.py | 4 +--- tests/components/ipp/test_sensor.py | 14 +------------- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 homeassistant/components/ipp/icons.json diff --git a/homeassistant/components/ipp/icons.json b/homeassistant/components/ipp/icons.json new file mode 100644 index 00000000000..08abebf674d --- /dev/null +++ b/homeassistant/components/ipp/icons.json @@ -0,0 +1,15 @@ +{ + "entity": { + "sensor": { + "printer": { + "default": "mdi:printer" + }, + "uptime": { + "default": "mdi:clock-outline" + }, + "marker": { + "default": "mdi:water" + } + } + } +} diff --git a/homeassistant/components/ipp/sensor.py b/homeassistant/components/ipp/sensor.py index d1acbe9bd96..72fe0751f9f 100644 --- a/homeassistant/components/ipp/sensor.py +++ b/homeassistant/components/ipp/sensor.py @@ -70,7 +70,6 @@ PRINTER_SENSORS: tuple[IPPSensorEntityDescription, ...] = ( key="printer", name=None, translation_key="printer", - icon="mdi:printer", device_class=SensorDeviceClass.ENUM, options=["idle", "printing", "stopped"], attributes_fn=lambda printer: { @@ -87,7 +86,6 @@ PRINTER_SENSORS: tuple[IPPSensorEntityDescription, ...] = ( IPPSensorEntityDescription( key="uptime", translation_key="uptime", - icon="mdi:clock-outline", device_class=SensorDeviceClass.TIMESTAMP, entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False, @@ -118,7 +116,7 @@ async def async_setup_entry( IPPSensorEntityDescription( key=f"marker_{index}", name=marker.name, - icon="mdi:water", + translation_key="marker", native_unit_of_measurement=PERCENTAGE, state_class=SensorStateClass.MEASUREMENT, attributes_fn=_get_marker_attributes_fn( diff --git a/tests/components/ipp/test_sensor.py b/tests/components/ipp/test_sensor.py index 52e8cdedf91..9673d614c10 100644 --- a/tests/components/ipp/test_sensor.py +++ b/tests/components/ipp/test_sensor.py @@ -4,12 +4,7 @@ from unittest.mock import AsyncMock import pytest from homeassistant.components.sensor import ATTR_OPTIONS -from homeassistant.const import ( - ATTR_ICON, - ATTR_UNIT_OF_MEASUREMENT, - PERCENTAGE, - EntityCategory, -) +from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, EntityCategory from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er @@ -26,7 +21,6 @@ async def test_sensors( """Test the creation and values of the IPP sensors.""" state = hass.states.get("sensor.test_ha_1000_series") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:printer" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None assert state.attributes.get(ATTR_OPTIONS) == ["idle", "printing", "stopped"] @@ -36,37 +30,31 @@ async def test_sensors( state = hass.states.get("sensor.test_ha_1000_series_black_ink") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:water" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE assert state.state == "58" state = hass.states.get("sensor.test_ha_1000_series_photo_black_ink") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:water" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE assert state.state == "98" state = hass.states.get("sensor.test_ha_1000_series_cyan_ink") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:water" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE assert state.state == "91" state = hass.states.get("sensor.test_ha_1000_series_yellow_ink") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:water" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE assert state.state == "95" state = hass.states.get("sensor.test_ha_1000_series_magenta_ink") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:water" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE assert state.state == "73" state = hass.states.get("sensor.test_ha_1000_series_uptime") assert state - assert state.attributes.get(ATTR_ICON) == "mdi:clock-outline" assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None assert state.state == "2019-11-11T09:10:02+00:00"