mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Remove Home Connect service error string constants (#141102)
This commit is contained in:
parent
34318ab655
commit
ffd5c003cb
@ -60,9 +60,6 @@ from .const import (
|
|||||||
SERVICE_SET_PROGRAM_AND_OPTIONS,
|
SERVICE_SET_PROGRAM_AND_OPTIONS,
|
||||||
SERVICE_SETTING,
|
SERVICE_SETTING,
|
||||||
SERVICE_START_PROGRAM,
|
SERVICE_START_PROGRAM,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_PROGRAM,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE,
|
|
||||||
TRANSLATION_KEYS_PROGRAMS_MAP,
|
TRANSLATION_KEYS_PROGRAMS_MAP,
|
||||||
)
|
)
|
||||||
from .coordinator import HomeConnectConfigEntry, HomeConnectCoordinator
|
from .coordinator import HomeConnectConfigEntry, HomeConnectCoordinator
|
||||||
@ -336,7 +333,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa:
|
|||||||
translation_key="start_program" if start else "select_program",
|
translation_key="start_program" if start else "select_program",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_PROGRAM: program,
|
"program": program,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -410,8 +407,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa:
|
|||||||
else "set_options_selected_program",
|
else "set_options_selected_program",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: option_key,
|
"key": option_key,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
|
"value": str(value),
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -466,8 +463,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa:
|
|||||||
translation_key="set_setting",
|
translation_key="set_setting",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: key,
|
"key": key,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
|
"value": str(value),
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -545,11 +542,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa:
|
|||||||
translation_key=exception_translation_key,
|
translation_key=exception_translation_key,
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
**(
|
**({"program": program} if program else {}),
|
||||||
{SVE_TRANSLATION_PLACEHOLDER_PROGRAM: program}
|
|
||||||
if program
|
|
||||||
else {}
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
@ -79,13 +79,6 @@ ATTR_VALUE = "value"
|
|||||||
AFFECTS_TO_ACTIVE_PROGRAM = "active_program"
|
AFFECTS_TO_ACTIVE_PROGRAM = "active_program"
|
||||||
AFFECTS_TO_SELECTED_PROGRAM = "selected_program"
|
AFFECTS_TO_SELECTED_PROGRAM = "selected_program"
|
||||||
|
|
||||||
SVE_TRANSLATION_KEY_SET_SETTING = "set_setting_entity"
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME = "appliance_name"
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID = "entity_id"
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_PROGRAM = "program"
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY = "key"
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE = "value"
|
|
||||||
|
|
||||||
|
|
||||||
TRANSLATION_KEYS_PROGRAMS_MAP = {
|
TRANSLATION_KEYS_PROGRAMS_MAP = {
|
||||||
bsh_key_to_translation_key(program.value): cast(ProgramKey, program)
|
bsh_key_to_translation_key(program.value): cast(ProgramKey, program)
|
||||||
|
@ -21,11 +21,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
|||||||
from homeassistant.util import color as color_util
|
from homeassistant.util import color as color_util
|
||||||
|
|
||||||
from .common import setup_home_connect_entry
|
from .common import setup_home_connect_entry
|
||||||
from .const import (
|
from .const import BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR, DOMAIN
|
||||||
BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
|
|
||||||
DOMAIN,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
|
|
||||||
)
|
|
||||||
from .coordinator import (
|
from .coordinator import (
|
||||||
HomeConnectApplianceData,
|
HomeConnectApplianceData,
|
||||||
HomeConnectConfigEntry,
|
HomeConnectConfigEntry,
|
||||||
@ -164,7 +160,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="turn_on_light",
|
translation_key="turn_on_light",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
if self._color_key and self._custom_color_key:
|
if self._color_key and self._custom_color_key:
|
||||||
@ -183,7 +179,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="select_light_custom_color",
|
translation_key="select_light_custom_color",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -201,7 +197,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="set_light_color",
|
translation_key="set_light_color",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
return
|
return
|
||||||
@ -231,7 +227,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="set_light_color",
|
translation_key="set_light_color",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
return
|
return
|
||||||
@ -254,7 +250,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="set_light_brightness",
|
translation_key="set_light_brightness",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -272,7 +268,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
|
|||||||
translation_key="turn_off_light",
|
translation_key="turn_off_light",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
@ -16,14 +16,7 @@ from homeassistant.exceptions import HomeAssistantError
|
|||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
|
|
||||||
from .common import setup_home_connect_entry
|
from .common import setup_home_connect_entry
|
||||||
from .const import (
|
from .const import DOMAIN, UNIT_MAP
|
||||||
DOMAIN,
|
|
||||||
SVE_TRANSLATION_KEY_SET_SETTING,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE,
|
|
||||||
UNIT_MAP,
|
|
||||||
)
|
|
||||||
from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
|
from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
|
||||||
from .entity import HomeConnectEntity, HomeConnectOptionEntity, constraint_fetcher
|
from .entity import HomeConnectEntity, HomeConnectOptionEntity, constraint_fetcher
|
||||||
from .utils import get_dict_from_home_connect_error
|
from .utils import get_dict_from_home_connect_error
|
||||||
@ -180,12 +173,12 @@ class HomeConnectNumberEntity(HomeConnectEntity, NumberEntity):
|
|||||||
except HomeConnectError as err:
|
except HomeConnectError as err:
|
||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN,
|
translation_domain=DOMAIN,
|
||||||
translation_key=SVE_TRANSLATION_KEY_SET_SETTING,
|
translation_key="set_setting_entity",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
|
"key": self.bsh_key,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
|
"value": str(value),
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
@ -31,11 +31,6 @@ from .const import (
|
|||||||
INTENSIVE_LEVEL_OPTIONS,
|
INTENSIVE_LEVEL_OPTIONS,
|
||||||
PROGRAMS_TRANSLATION_KEYS_MAP,
|
PROGRAMS_TRANSLATION_KEYS_MAP,
|
||||||
SPIN_SPEED_OPTIONS,
|
SPIN_SPEED_OPTIONS,
|
||||||
SVE_TRANSLATION_KEY_SET_SETTING,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_PROGRAM,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE,
|
|
||||||
TEMPERATURE_OPTIONS,
|
TEMPERATURE_OPTIONS,
|
||||||
TRANSLATION_KEYS_PROGRAMS_MAP,
|
TRANSLATION_KEYS_PROGRAMS_MAP,
|
||||||
VARIO_PERFECT_OPTIONS,
|
VARIO_PERFECT_OPTIONS,
|
||||||
@ -406,7 +401,7 @@ class HomeConnectProgramSelectEntity(HomeConnectEntity, SelectEntity):
|
|||||||
translation_key=self.entity_description.error_translation_key,
|
translation_key=self.entity_description.error_translation_key,
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_PROGRAM: program_key.value,
|
"program": program_key.value,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -443,12 +438,12 @@ class HomeConnectSelectEntity(HomeConnectEntity, SelectEntity):
|
|||||||
except HomeConnectError as err:
|
except HomeConnectError as err:
|
||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN,
|
translation_domain=DOMAIN,
|
||||||
translation_key=SVE_TRANSLATION_KEY_SET_SETTING,
|
translation_key="set_setting_entity",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
|
"key": self.bsh_key,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: value,
|
"value": value,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
@ -22,16 +22,7 @@ from homeassistant.helpers.issue_registry import (
|
|||||||
from homeassistant.helpers.typing import UNDEFINED, UndefinedType
|
from homeassistant.helpers.typing import UNDEFINED, UndefinedType
|
||||||
|
|
||||||
from .common import setup_home_connect_entry
|
from .common import setup_home_connect_entry
|
||||||
from .const import (
|
from .const import BSH_POWER_OFF, BSH_POWER_ON, BSH_POWER_STANDBY, DOMAIN
|
||||||
BSH_POWER_OFF,
|
|
||||||
BSH_POWER_ON,
|
|
||||||
BSH_POWER_STANDBY,
|
|
||||||
DOMAIN,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE,
|
|
||||||
)
|
|
||||||
from .coordinator import (
|
from .coordinator import (
|
||||||
HomeConnectApplianceData,
|
HomeConnectApplianceData,
|
||||||
HomeConnectConfigEntry,
|
HomeConnectConfigEntry,
|
||||||
@ -226,8 +217,8 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
translation_key="turn_on",
|
translation_key="turn_on",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
|
"key": self.bsh_key,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -246,8 +237,8 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
translation_key="turn_off",
|
translation_key="turn_off",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
|
"key": self.bsh_key,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -385,7 +376,7 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
translation_key="power_on",
|
translation_key="power_on",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.appliance.info.name,
|
"appliance_name": self.appliance.info.name,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
@ -398,7 +389,7 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
translation_domain=DOMAIN,
|
translation_domain=DOMAIN,
|
||||||
translation_key="unable_to_retrieve_turn_off",
|
translation_key="unable_to_retrieve_turn_off",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.appliance.info.name
|
"appliance_name": self.appliance.info.name
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -406,9 +397,7 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN,
|
translation_domain=DOMAIN,
|
||||||
translation_key="turn_off_not_supported",
|
translation_key="turn_off_not_supported",
|
||||||
translation_placeholders={
|
translation_placeholders={"appliance_name": self.appliance.info.name},
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.appliance.info.name
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
await self.coordinator.client.set_setting(
|
await self.coordinator.client.set_setting(
|
||||||
@ -423,8 +412,8 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
|
|||||||
translation_key="power_off",
|
translation_key="power_off",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.appliance.info.name,
|
"appliance_name": self.appliance.info.name,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: self.power_off_state,
|
"value": self.power_off_state,
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
@ -12,13 +12,7 @@ from homeassistant.exceptions import HomeAssistantError
|
|||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
|
|
||||||
from .common import setup_home_connect_entry
|
from .common import setup_home_connect_entry
|
||||||
from .const import (
|
from .const import DOMAIN
|
||||||
DOMAIN,
|
|
||||||
SVE_TRANSLATION_KEY_SET_SETTING,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY,
|
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE,
|
|
||||||
)
|
|
||||||
from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
|
from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
|
||||||
from .entity import HomeConnectEntity
|
from .entity import HomeConnectEntity
|
||||||
from .utils import get_dict_from_home_connect_error
|
from .utils import get_dict_from_home_connect_error
|
||||||
@ -84,12 +78,12 @@ class HomeConnectTimeEntity(HomeConnectEntity, TimeEntity):
|
|||||||
except HomeConnectError as err:
|
except HomeConnectError as err:
|
||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN,
|
translation_domain=DOMAIN,
|
||||||
translation_key=SVE_TRANSLATION_KEY_SET_SETTING,
|
translation_key="set_setting_entity",
|
||||||
translation_placeholders={
|
translation_placeholders={
|
||||||
**get_dict_from_home_connect_error(err),
|
**get_dict_from_home_connect_error(err),
|
||||||
SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
|
"entity_id": self.entity_id,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
|
"key": self.bsh_key,
|
||||||
SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
|
"value": str(value),
|
||||||
},
|
},
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user