From 54ed8fc914dce70149dca071b133df85292bf82c Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Thu, 24 Aug 2023 22:19:29 +0200
Subject: [PATCH] Use device class translations for 1-wire (#98813)

---
 homeassistant/components/onewire/sensor.py    | 16 -------
 homeassistant/components/onewire/strings.json | 15 ------
 .../onewire/snapshots/test_sensor.ambr        | 46 +++++++++----------
 3 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/homeassistant/components/onewire/sensor.py b/homeassistant/components/onewire/sensor.py
index 65bd542fc30..34ed66bd511 100644
--- a/homeassistant/components/onewire/sensor.py
+++ b/homeassistant/components/onewire/sensor.py
@@ -73,7 +73,6 @@ SIMPLE_TEMPERATURE_SENSOR_DESCRIPTION = OneWireSensorEntityDescription(
     native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     read_mode=READ_MODE_FLOAT,
     state_class=SensorStateClass.MEASUREMENT,
-    translation_key="temperature",
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -89,7 +88,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="temperature",
         ),
         OneWireSensorEntityDescription(
             key="TAI8570/pressure",
@@ -98,7 +96,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfPressure.MBAR,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="pressure",
         ),
     ),
     "22": (SIMPLE_TEMPERATURE_SENSOR_DESCRIPTION,),
@@ -111,7 +108,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=PERCENTAGE,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="humidity",
         ),
         OneWireSensorEntityDescription(
             key="HIH3600/humidity",
@@ -156,7 +152,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfPressure.MBAR,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="pressure",
         ),
         OneWireSensorEntityDescription(
             key="S3-R1-A/illuminance",
@@ -165,7 +160,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=LIGHT_LUX,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="illuminance",
         ),
         OneWireSensorEntityDescription(
             key="VAD",
@@ -203,7 +197,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             override_key=_get_sensor_precision_family_28,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="temperature",
         ),
     ),
     "30": (
@@ -225,7 +218,6 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="voltage",
         ),
         OneWireSensorEntityDescription(
             key="vis",
@@ -261,7 +253,6 @@ HOBBYBOARD_EF: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=PERCENTAGE,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="humidity",
         ),
         OneWireSensorEntityDescription(
             key="humidity/humidity_raw",
@@ -277,7 +268,6 @@ HOBBYBOARD_EF: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="temperature",
         ),
     ),
     "HB_MOISTURE_METER": tuple(
@@ -303,7 +293,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="temperature",
         ),
         OneWireSensorEntityDescription(
             key="EDS0066/pressure",
@@ -311,7 +300,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfPressure.MBAR,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="pressure",
         ),
     ),
     "EDS0068": (
@@ -321,7 +309,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="temperature",
         ),
         OneWireSensorEntityDescription(
             key="EDS0068/pressure",
@@ -329,7 +316,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=UnitOfPressure.MBAR,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="pressure",
         ),
         OneWireSensorEntityDescription(
             key="EDS0068/light",
@@ -337,7 +323,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=LIGHT_LUX,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="illuminance",
         ),
         OneWireSensorEntityDescription(
             key="EDS0068/humidity",
@@ -345,7 +330,6 @@ EDS_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             native_unit_of_measurement=PERCENTAGE,
             read_mode=READ_MODE_FLOAT,
             state_class=SensorStateClass.MEASUREMENT,
-            translation_key="humidity",
         ),
     ),
 }
diff --git a/homeassistant/components/onewire/strings.json b/homeassistant/components/onewire/strings.json
index f58731a2377..9e4120b68b2 100644
--- a/homeassistant/components/onewire/strings.json
+++ b/homeassistant/components/onewire/strings.json
@@ -68,9 +68,6 @@
       "counter_b": {
         "name": "Counter B"
       },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
       "humidity_hih3600": {
         "name": "HIH3600 humidity"
       },
@@ -86,9 +83,6 @@
       "humidity_raw": {
         "name": "Raw humidity"
       },
-      "illuminance": {
-        "name": "[%key:component::sensor::entity_component::illuminance::name%]"
-      },
       "moisture_1": {
         "name": "Moisture 1"
       },
@@ -101,18 +95,9 @@
       "moisture_4": {
         "name": "Moisture 4"
       },
-      "pressure": {
-        "name": "[%key:component::sensor::entity_component::pressure::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
       "thermocouple_temperature_k": {
         "name": "Thermocouple K temperature"
       },
-      "voltage": {
-        "name": "[%key:component::sensor::entity_component::voltage::name%]"
-      },
       "voltage_vad": {
         "name": "VAD voltage"
       },
diff --git a/tests/components/onewire/snapshots/test_sensor.ambr b/tests/components/onewire/snapshots/test_sensor.ambr
index 6c18c1ec652..0664d7e5402 100644
--- a/tests/components/onewire/snapshots/test_sensor.ambr
+++ b/tests/components/onewire/snapshots/test_sensor.ambr
@@ -105,7 +105,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/10.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -187,7 +187,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/12.111111111111/TAI8570/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -217,7 +217,7 @@
       'original_name': 'Pressure',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'pressure',
+      'translation_key': None,
       'unique_id': '/12.111111111111/TAI8570/pressure',
       'unit_of_measurement': <UnitOfPressure.MBAR: 'mbar'>,
     }),
@@ -589,7 +589,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/22.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -671,7 +671,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/26.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -701,7 +701,7 @@
       'original_name': 'Humidity',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'humidity',
+      'translation_key': None,
       'unique_id': '/26.111111111111/humidity',
       'unit_of_measurement': '%',
     }),
@@ -851,7 +851,7 @@
       'original_name': 'Pressure',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'pressure',
+      'translation_key': None,
       'unique_id': '/26.111111111111/B1-R1-A/pressure',
       'unit_of_measurement': <UnitOfPressure.MBAR: 'mbar'>,
     }),
@@ -881,7 +881,7 @@
       'original_name': 'Illuminance',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'illuminance',
+      'translation_key': None,
       'unique_id': '/26.111111111111/S3-R1-A/illuminance',
       'unit_of_measurement': 'lx',
     }),
@@ -1203,7 +1203,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/28.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1285,7 +1285,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/28.222222222222/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1367,7 +1367,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/28.222222222223/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1486,7 +1486,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/30.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1546,7 +1546,7 @@
       'original_name': 'Voltage',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'voltage',
+      'translation_key': None,
       'unique_id': '/30.111111111111/volt',
       'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
     }),
@@ -1740,7 +1740,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/3B.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1822,7 +1822,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/42.111111111111/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1904,7 +1904,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/7E.111111111111/EDS0068/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -1934,7 +1934,7 @@
       'original_name': 'Pressure',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'pressure',
+      'translation_key': None,
       'unique_id': '/7E.111111111111/EDS0068/pressure',
       'unit_of_measurement': <UnitOfPressure.MBAR: 'mbar'>,
     }),
@@ -1964,7 +1964,7 @@
       'original_name': 'Illuminance',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'illuminance',
+      'translation_key': None,
       'unique_id': '/7E.111111111111/EDS0068/light',
       'unit_of_measurement': 'lx',
     }),
@@ -1994,7 +1994,7 @@
       'original_name': 'Humidity',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'humidity',
+      'translation_key': None,
       'unique_id': '/7E.111111111111/EDS0068/humidity',
       'unit_of_measurement': '%',
     }),
@@ -2121,7 +2121,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/7E.222222222222/EDS0066/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
@@ -2151,7 +2151,7 @@
       'original_name': 'Pressure',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'pressure',
+      'translation_key': None,
       'unique_id': '/7E.222222222222/EDS0066/pressure',
       'unit_of_measurement': <UnitOfPressure.MBAR: 'mbar'>,
     }),
@@ -2248,7 +2248,7 @@
       'original_name': 'Humidity',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'humidity',
+      'translation_key': None,
       'unique_id': '/EF.111111111111/humidity/humidity_corrected',
       'unit_of_measurement': '%',
     }),
@@ -2308,7 +2308,7 @@
       'original_name': 'Temperature',
       'platform': 'onewire',
       'supported_features': 0,
-      'translation_key': 'temperature',
+      'translation_key': None,
       'unique_id': '/EF.111111111111/humidity/temperature',
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),