More translations of default entity names

custom_components/sun2/config.py

@@ -3,6 +3,7 @@
 
 from typing import cast
 
+from astral import SunDirection
 import voluptuous as vol
 
 from homeassistant.const import (
@@ -24,14 +25,14 @@
     SUN2_BINARY_SENSOR_SCHEMA,
     val_bs_cfg,
 )
-from .const import CONF_ELEVATION_AT_TIME, DOMAIN
-from .helpers import LOC_PARAMS, Sun2Data
-from .sensor import (
-    _eat_defaults,
-    _tae_defaults,
-    ELEVATION_AT_TIME_SCHEMA,
-    TIME_AT_ELEVATION_SCHEMA,
+from .const import (
+    CONF_DIRECTION,
+    CONF_ELEVATION_AT_TIME,
+    CONF_TIME_AT_ELEVATION,
+    DOMAIN,
 )
+from .helpers import LOC_PARAMS, Sun2Data
+from .sensor import val_tae_cfg, ELEVATION_AT_TIME_SCHEMA, TIME_AT_ELEVATION_SCHEMA
 
 _SUN2_LOCATION_CONFIG = vol.Schema(
     {
@@ -70,31 +71,61 @@ def _unique_locations_names(configs: list[dict]) -> list[dict]:
 )
 
 
+def _translation(hass: HomeAssistant, key: str) -> str:
+    """Sun2 translations."""
+    return cast(Sun2Data, hass.data[DOMAIN]).translations[
+        f"component.{DOMAIN}.misc.{key}"
+    ]
+
+
 def _val_bs_name(hass: HomeAssistant, config: str | ConfigType) -> ConfigType:
     """Validate binary_sensor name."""
     if CONF_ELEVATION in config:
         options = config[CONF_ELEVATION]
         if CONF_NAME not in options:
             above = options[CONF_ABOVE]
             if above == DEFAULT_ELEVATION_ABOVE:
-                name = cast(Sun2Data, hass.data[DOMAIN]).translations[
-                    f"component.{DOMAIN}.misc.above_horizon"
-                ]
+                name = _translation(hass, "above_horizon")
             else:
-                above_str = cast(Sun2Data, hass.data[DOMAIN]).translations[
-                    f"component.{DOMAIN}.misc.above"
-                ]
+                above_str = _translation(hass, "above")
                 if above < 0:
-                    minus_str = cast(Sun2Data, hass.data[DOMAIN]).translations[
-                        f"component.{DOMAIN}.misc.minus"
-                    ]
+                    minus_str = _translation(hass, "minus")
                     name = f"{above_str} {minus_str} {-above}"
                 else:
                     name = f"{above_str} {above}"
             options[CONF_NAME] = name
     return config
 
 
+def _val_eat_name(hass: HomeAssistant, config: str | ConfigType) -> ConfigType:
+    """Validate elevation_at_time name."""
+    if config.get(CONF_NAME):
+        return config
+
+    config[
+        CONF_NAME
+    ] = f"{_translation(hass, 'elevation_at')} {config[CONF_ELEVATION_AT_TIME]}"
+
+    return config
+
+
+def _val_tae_name(hass: HomeAssistant, config: str | ConfigType) -> ConfigType:
+    """Validate time_at_elevation name."""
+    if config.get(CONF_NAME):
+        return config
+
+    direction = SunDirection(config[CONF_DIRECTION])
+    elevation = cast(float, config[CONF_TIME_AT_ELEVATION])
+
+    if elevation >= 0:
+        elev_str = str(elevation)
+    else:
+        elev_str = f"{_translation(hass, 'minus')} {-elevation}"
+    config[CONF_NAME] = f"{_translation(hass, direction.name.lower())} at {elev_str} °"
+
+    return config
+
+
 async def async_validate_config(
     hass: HomeAssistant, config: ConfigType
 ) -> ConfigType | None:
@@ -123,8 +154,10 @@ async def async_validate_config(
             sensor_configs = []
             for sensor_config in loc_config[CONF_SENSORS]:
                 if CONF_ELEVATION_AT_TIME in sensor_config:
-                    sensor_configs.append(_eat_defaults(sensor_config))
+                    sensor_configs.append(_val_eat_name(hass, sensor_config))
                 else:
-                    sensor_configs.append(_tae_defaults(sensor_config))
+                    sensor_configs.append(
+                        _val_tae_name(hass, val_tae_cfg(sensor_config))
+                    )
             loc_config[CONF_SENSORS] = sensor_configs
     return config

custom_components/sun2/sensor.py

@@ -1164,29 +1164,36 @@ class SensorParams:
 }
 
 
+def val_tae_cfg(config: ConfigType) -> ConfigType:
+    """Validate time_at_elevation config."""
+    direction = SunDirection(config[CONF_DIRECTION])
+    if not config.get(CONF_ICON):
+        config[CONF_ICON] = _DIR_TO_ICON[direction]
+    return config
+
+
 def _tae_defaults(config: ConfigType) -> ConfigType:
-    """Fill in defaults."""
+    """Fill in defaults including name."""
+    config = val_tae_cfg(config)
 
-    elevation = cast(float, config[CONF_TIME_AT_ELEVATION])
-    direction = cast(SunDirection, config[CONF_DIRECTION])
+    if config.get(CONF_NAME):
+        return config
 
-    if not config.get(CONF_ICON):
-        config[CONF_ICON] = _DIR_TO_ICON[direction]
+    direction = SunDirection(config[CONF_DIRECTION])
+    elevation = cast(float, config[CONF_TIME_AT_ELEVATION])
 
-    if not config.get(CONF_NAME):
-        dir_str = direction.name.title()
-        if elevation >= 0:
-            elev_str = str(elevation)
-        else:
-            elev_str = f"minus {-elevation}"
-        config[CONF_NAME] = f"{dir_str} at {elev_str} °"
+    dir_str = direction.name.title()
+    if elevation >= 0:
+        elev_str = str(elevation)
+    else:
+        elev_str = f"minus {-elevation}"
+    config[CONF_NAME] = f"{dir_str} at {elev_str} °"
 
     return config
 
 
 def _eat_defaults(config: ConfigType) -> ConfigType:
-    """Fill in defaults."""
-
+    """Fill in defaults including name."""
     if not config.get(CONF_NAME):
         config[CONF_NAME] = f"Elevation at {config[CONF_ELEVATION_AT_TIME]}"
 

custom_components/sun2/translations/en.json

@@ -3,8 +3,11 @@
     "misc": {
         "above": "Above",
         "above_horizon": "Above Horizon",
+        "elevation_at": "Elevation at",
         "minus": "minus",
-        "service_name": "Sun"
+        "rising": "Rising",
+        "service_name": "Sun",
+        "setting": "Setting"
     },
     "entity": {
         "sensor": {