Skip to content

Commit 3b14280

Browse files
committed
Be less user friendly
Apparently only official bits are permitted to be translated
1 parent 2d5bf56 commit 3b14280

File tree

5 files changed

+13
-43
lines changed

5 files changed

+13
-43
lines changed

custom_components/powersensor/PowersensorSensorEntity.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
from .PowersensorEntity import PowersensorEntity
88
from .SensorMeasurements import SensorMeasurements
9-
from .const import DOMAIN
10-
from .custom_translations import translate
9+
from .const import DOMAIN, SENSOR_NAME_FORMAT
1110

1211
import logging
1312
_LOGGER = logging.getLogger(__name__)
@@ -80,11 +79,16 @@ def _ensure_matching_prefix(self):
8079
def _rename_based_on_role(self):
8180
if self._device_name == self._default_device_name():
8281
if self.role =='house-net' or self.role == "water" or self.role == "solar":
83-
self._device_name = translate(f"sensor_types.{self.role}")
82+
role2name = {
83+
"house-net": "Powersensor Mains Sensor ⚡",
84+
"solar": "Powersensor Solar Sensor ⚡",
85+
"water": "Powersensor Water Sensor 💧",
86+
}
87+
self._device_name = role2name[self.role]
8488
self._ensure_matching_prefix()
8589
return True
8690
return False
8791

8892
def _default_device_name(self):
89-
return translate("formats.sensor") % self._mac
93+
return SENSOR_NAME_FORMAT % self._mac
9094

custom_components/powersensor/config_flow.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
from homeassistant.helpers.service_info import zeroconf
1010
from homeassistant.helpers.selector import selector
1111

12-
from .const import DEFAULT_PORT, DOMAIN
13-
from .custom_translations import translate
12+
from .const import DEFAULT_PORT, DOMAIN, SENSOR_NAME_FORMAT
1413

1514
def _extract_device_name(discovery_info) -> str:
1615
"""Extract a user-friendly device name from zeroconf info."""
1716
properties = discovery_info.properties or {}
1817

1918
if "id" in properties:
20-
return translate("formats.discovery_name") % properties["id"].strip()
19+
return f"🔌 Mac({properties["id"].strip()})"
2120

2221
# Fall back to cleaning up the service name
2322
name = discovery_info.name or ""
@@ -56,7 +55,7 @@ async def async_step_reconfigure(self, user_input: dict | None = None)->FlowResu
5655
entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
5756
dispatcher = entry.runtime_data["dispatcher"]
5857

59-
mac2name = { mac: translate("formats.sensor") % mac for mac in dispatcher.sensors }
58+
mac2name = { mac: SENSOR_NAME_FORMAT % mac for mac in dispatcher.sensors }
6059

6160
unknown = "<unknown>"
6261
if user_input is not None:

custom_components/powersensor/const.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
DEFAULT_PORT = 49476
66
DEFAULT_SCAN_INTERVAL = 30
77
POWER_SENSOR_UPDATE_SIGNAL = f"{DOMAIN}_sensor"
8-
# Configuration keys
9-
CONF_HOST = "host"
10-
CONF_PORT = "port"
8+
9+
SENSOR_NAME_FORMAT = "Powersensor Sensor (ID: %s) ⚡"

custom_components/powersensor/custom_translations.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

custom_components/powersensor/translations/en.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
"config": {
33
"title" : "Powersensor",
44
"step": {
5-
"user": {
6-
"description": "Enter the connection details for your device",
7-
"data": {
8-
"host": "Host",
9-
"port": "Port"
10-
}
11-
},
125
"discovery_confirm": {
136
"description": "Do you want to add Powersensor to Home Assistant?",
147
"title": "Powersensor plugs discovered"
@@ -19,7 +12,6 @@
1912
}
2013
},
2114
"error": {
22-
"cannot_connect": "Failed to connect",
2315
"unknown": "Unexpected error"
2416
},
2517
"abort": {
@@ -28,16 +20,5 @@
2820
"already_configured": "Device is already configured",
2921
"cannot_connect": "Failed to connect"
3022
}
31-
},
32-
"custom": {
33-
"formats": {
34-
"sensor": "Powersensor Sensor (ID: %s) ⚡",
35-
"discovery_name": "🔌 Mac(%s)"
36-
},
37-
"sensor_types": {
38-
"house-net": "Powersensor Mains Sensor ⚡",
39-
"solar": "Powersensor Solar Sensor ⚡",
40-
"water": "Powersensor Water Sensor 💧"
41-
}
4223
}
4324
}

0 commit comments

Comments
 (0)