custom_components/irm_kmi/__init__.py

@@ -45,7 +45,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Reload config entry."""
-    await hass.config_entries.async_reload(entry.entry_id)
+    await async_unload_entry(hass, entry)
+    await async_setup_entry(hass, entry)
 
 
 async def async_migrate_entry(hass, config_entry: ConfigEntry):

custom_components/irm_kmi/config_flow.py

@@ -107,7 +107,7 @@ class IrmKmiConfigFlow(ConfigFlow, domain=DOMAIN):
 class IrmKmiOptionFlow(OptionsFlow):
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self.current_config_entry = config_entry
+        self.config_entry = config_entry
 
     async def async_step_init(self, user_input: dict | None = None) -> FlowResult:
         """Manage the options."""
@@ -119,21 +119,21 @@ class IrmKmiOptionFlow(OptionsFlow):
             step_id="init",
             data_schema=vol.Schema(
                 {
-                    vol.Optional(CONF_STYLE, default=get_config_value(self.current_config_entry, CONF_STYLE)):
+                    vol.Optional(CONF_STYLE, default=get_config_value(self.config_entry, CONF_STYLE)):
                         SelectSelector(SelectSelectorConfig(options=CONF_STYLE_OPTIONS,
                                                             mode=SelectSelectorMode.DROPDOWN,
                                                             translation_key=CONF_STYLE)),
 
-                    vol.Optional(CONF_DARK_MODE, default=get_config_value(self.current_config_entry, CONF_DARK_MODE)): bool,
+                    vol.Optional(CONF_DARK_MODE, default=get_config_value(self.config_entry, CONF_DARK_MODE)): bool,
 
                     vol.Optional(CONF_USE_DEPRECATED_FORECAST,
-                                 default=get_config_value(self.current_config_entry, CONF_USE_DEPRECATED_FORECAST)):
+                                 default=get_config_value(self.config_entry, CONF_USE_DEPRECATED_FORECAST)):
                         SelectSelector(SelectSelectorConfig(options=CONF_USE_DEPRECATED_FORECAST_OPTIONS,
                                                             mode=SelectSelectorMode.DROPDOWN,
                                                             translation_key=CONF_USE_DEPRECATED_FORECAST)),
 
                     vol.Optional(CONF_LANGUAGE_OVERRIDE,
-                                 default=get_config_value(self.current_config_entry, CONF_LANGUAGE_OVERRIDE)):
+                                 default=get_config_value(self.config_entry, CONF_LANGUAGE_OVERRIDE)):
                         SelectSelector(SelectSelectorConfig(options=CONF_LANGUAGE_OVERRIDE_OPTIONS,
                                                             mode=SelectSelectorMode.DROPDOWN,
                                                             translation_key=CONF_LANGUAGE_OVERRIDE))

custom_components/irm_kmi/coordinator.py

@@ -43,7 +43,6 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=entry,
             # Name of the data. For logging purposes.
             name="IRM KMI weather",
             # Polling interval. Will only be polled if there are subscribers.
@@ -53,10 +52,11 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
         self._zone = get_config_value(entry, CONF_ZONE)
         self._dark_mode = get_config_value(entry, CONF_DARK_MODE)
         self._style = get_config_value(entry, CONF_STYLE)
+        self._config_entry = entry
         self.shared_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, entry.entry_id)},
-            manufacturer=IRM_KMI_NAME.get(preferred_language(self.hass, self.config_entry)),
+            manufacturer=IRM_KMI_NAME.get(preferred_language(self.hass, self._config_entry)),
             name=f"{entry.title}"
         )
 
@@ -89,10 +89,10 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
                                    f"Last success time is: {self.last_update_success_time}")
 
         if api_data.get('cityName', None) in OUT_OF_BENELUX:
-            _LOGGER.error(f"The zone {self._zone} is now out of Benelux and forecast is only available in Benelux. "
+            _LOGGER.error(f"The zone {self._zone} is now out of Benelux and forecast is only available in Benelux."
                           f"Associated device is now disabled.  Move the zone back in Benelux and re-enable to fix "
                           f"this")
-            disable_from_config(self.hass, self.config_entry)
+            disable_from_config(self.hass, self._config_entry)
 
             issue_registry.async_create_issue(
                 self.hass,
@@ -101,7 +101,7 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
                 is_fixable=True,
                 severity=issue_registry.IssueSeverity.ERROR,
                 translation_key='zone_moved',
-                data={'config_entry_id': self.config_entry.entry_id, 'zone': self._zone},
+                data={'config_entry_id': self._config_entry.entry_id, 'zone': self._zone},
                 translation_placeholders={'zone': self._zone}
             )
             return ProcessedCoordinatorData()
@@ -131,7 +131,7 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
         localisation = images_from_api[0]
         images_from_api = images_from_api[1:]
 
-        lang = preferred_language(self.hass, self.config_entry)
+        lang = preferred_language(self.hass, self._config_entry)
         radar_animation = RadarAnimationData(
             hint=api_data.get('animation', {}).get('sequenceHint', {}).get(lang),
             unit=api_data.get('animation', {}).get('unit', {}).get(lang),
@@ -367,7 +367,7 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
             return None
 
         forecasts = list()
-        lang = preferred_language(self.hass, self.config_entry)
+        lang = preferred_language(self.hass, self._config_entry)
         tz = await dt.async_get_time_zone('Europe/Brussels')
         forecast_day = dt.now(tz)
 
@@ -502,7 +502,7 @@ class IrmKmiCoordinator(TimestampDataUpdateCoordinator):
         if warning_data is None or not isinstance(warning_data, list) or len(warning_data) == 0:
             return []
 
-        lang = preferred_language(self.hass, self.config_entry)
+        lang = preferred_language(self.hass, self._config_entry)
         result = list()
         for data in warning_data:
             try:

custom_components/irm_kmi/manifest.json

@@ -12,5 +12,5 @@
     "svgwrite==1.4.3",
     "aiofile==3.9.0"
   ],
-  "version": "0.2.25"
+  "version": "0.2.24"
 }