From cf8da2fc8930d540b899a577ca6098e1857b2a57 Mon Sep 17 00:00:00 2001 From: starkillerOG Date: Sat, 2 Sep 2023 22:13:17 +0200 Subject: [PATCH] Motion blinds add translations (#99078) --- .../components/motion_blinds/cover.py | 6 ++---- .../components/motion_blinds/entity.py | 2 ++ .../components/motion_blinds/sensor.py | 14 ++----------- .../components/motion_blinds/strings.json | 21 +++++++++++++++++++ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/homeassistant/components/motion_blinds/cover.py b/homeassistant/components/motion_blinds/cover.py index 1a4507f1066..833d2640202 100644 --- a/homeassistant/components/motion_blinds/cover.py +++ b/homeassistant/components/motion_blinds/cover.py @@ -33,7 +33,6 @@ from .const import ( UPDATE_INTERVAL_MOVING_WIFI, ) from .entity import MotionCoordinatorEntity -from .gateway import device_name _LOGGER = logging.getLogger(__name__) @@ -170,6 +169,7 @@ async def async_setup_entry( class MotionPositionDevice(MotionCoordinatorEntity, CoverEntity): """Representation of a Motion Blind Device.""" + _attr_name = None _restore_tilt = False def __init__(self, coordinator, blind, device_class): @@ -184,9 +184,7 @@ class MotionPositionDevice(MotionCoordinatorEntity, CoverEntity): else: self._update_interval_moving = UPDATE_INTERVAL_MOVING - name = device_name(blind) self._attr_device_class = device_class - self._attr_name = name self._attr_unique_id = blind.mac @property @@ -402,7 +400,7 @@ class MotionTDBUDevice(MotionPositionDevice): super().__init__(coordinator, blind, device_class) self._motor = motor self._motor_key = motor[0] - self._attr_name = f"{device_name(blind)} {motor}" + self._attr_translation_key = motor.lower() self._attr_unique_id = f"{blind.mac}-{motor}" if self._motor not in ["Bottom", "Top", "Combined"]: diff --git a/homeassistant/components/motion_blinds/entity.py b/homeassistant/components/motion_blinds/entity.py index d57d7401b47..8f3ac05228d 100644 --- a/homeassistant/components/motion_blinds/entity.py +++ b/homeassistant/components/motion_blinds/entity.py @@ -22,6 +22,8 @@ from .gateway import device_name class MotionCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinatorMotionBlinds]): """Representation of a Motion Blind entity.""" + _attr_has_entity_name = True + def __init__( self, coordinator: DataUpdateCoordinatorMotionBlinds, diff --git a/homeassistant/components/motion_blinds/sensor.py b/homeassistant/components/motion_blinds/sensor.py index 977f543ce98..d8dc25e0006 100644 --- a/homeassistant/components/motion_blinds/sensor.py +++ b/homeassistant/components/motion_blinds/sensor.py @@ -1,5 +1,5 @@ """Support for Motion Blinds sensors.""" -from motionblinds import DEVICE_TYPES_GATEWAY, DEVICE_TYPES_WIFI, BlindType +from motionblinds import DEVICE_TYPES_WIFI, BlindType from homeassistant.components.sensor import SensorDeviceClass, SensorEntity from homeassistant.config_entries import ConfigEntry @@ -13,7 +13,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DOMAIN, KEY_COORDINATOR, KEY_GATEWAY from .entity import MotionCoordinatorEntity -from .gateway import device_name ATTR_BATTERY_VOLTAGE = "battery_voltage" @@ -53,8 +52,6 @@ class MotionBatterySensor(MotionCoordinatorEntity, SensorEntity): def __init__(self, coordinator, blind): """Initialize the Motion Battery Sensor.""" super().__init__(coordinator, blind) - - self._attr_name = f"{device_name(blind)} battery" self._attr_unique_id = f"{blind.mac}-battery" @property @@ -77,7 +74,7 @@ class MotionTDBUBatterySensor(MotionBatterySensor): self._motor = motor self._attr_unique_id = f"{blind.mac}-{motor}-battery" - self._attr_name = f"{device_name(blind)} {motor} battery" + self._attr_translation_key = f"{motor.lower()}_battery" @property def native_value(self): @@ -108,14 +105,7 @@ class MotionSignalStrengthSensor(MotionCoordinatorEntity, SensorEntity): def __init__(self, coordinator, blind): """Initialize the Motion Signal Strength Sensor.""" super().__init__(coordinator, blind) - - if blind.device_type in DEVICE_TYPES_GATEWAY: - name = "Motion gateway signal strength" - else: - name = f"{device_name(blind)} signal strength" - self._attr_unique_id = f"{blind.mac}-RSSI" - self._attr_name = name @property def native_value(self): diff --git a/homeassistant/components/motion_blinds/strings.json b/homeassistant/components/motion_blinds/strings.json index 0e0a32bfb24..cb9468c3a27 100644 --- a/homeassistant/components/motion_blinds/strings.json +++ b/homeassistant/components/motion_blinds/strings.json @@ -60,5 +60,26 @@ } } } + }, + "entity": { + "cover": { + "top": { + "name": "Top" + }, + "bottom": { + "name": "Bottom" + }, + "combined": { + "name": "Combined" + } + }, + "sensor": { + "top_battery": { + "name": "Top battery" + }, + "bottom_battery": { + "name": "Bottom battery" + } + } } }