This commit is contained in:
J. Nick Koston 2025-04-16 19:10:59 -10:00
parent afb973938e
commit c64e647d8f
No known key found for this signature in database
2 changed files with 5 additions and 2 deletions

View File

@ -458,13 +458,16 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
if self.source == SOURCE_RECONFIGURE:
assert self.unique_id is not None
assert self._reconfig_entry.unique_id is not None
assert self._host is not None
assert self._device_name is not None
if self._reconfig_entry.unique_id != format_mac(self.unique_id):
return self.async_abort(
reason="reconfigure_unique_id_changed",
description_placeholders={
"name": self._reconfig_entry.title,
"host": self._host,
"expected_mac": format_mac(self._reconfig_entry.unique_id),
"unexpected_device_name": self._device_name or "",
"unexpected_device_name": self._device_name,
"unexpected_mac": format_mac(self.unique_id),
},
)

View File

@ -12,7 +12,7 @@
"mqtt_missing_payload": "Missing MQTT Payload.",
"name_conflict_migrated": "The configuration for `{name}` has been migrated to a new device with MAC address `{mac}` from `{existing_mac}`.",
"reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
"reconfigure_unique_id_changed": "**Reconfiguration of `{name}` was aborted** because the provided connection settings refer to a different device: `{unexpected_device_name}` (MAC: `{unexpected_mac}`) instead of the expected device (MAC: `{expected_mac}`)."
"reconfigure_unique_id_changed": "**Reconfiguration of `{name}` was aborted** because the address `{host}` points to a different device: `{unexpected_device_name}` (MAC: `{unexpected_mac}`) instead of the expected one (MAC: `{expected_mac}`)."
},
"error": {
"resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address",