Fixed broken option translation in #115, updated base library & remov…

…ed dacite dependency
signalkraft · Feb 24, 2024 · 49ffa31 · 49ffa31
1 parent f6516a9
commit 49ffa31
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 12 deletions.
diff --git a/custom_components/mypyllant/__init__.py b/custom_components/mypyllant/__init__.py
@@ -83,11 +83,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         from importlib.metadata import version
 
         _LOGGER.debug(
-            "Starting mypyllant component %s (library %s) with homeassistant %s, dacite %s, and aiohttp %s",
+            "Starting mypyllant component %s (library %s) with homeassistant %s, pydantic %s, and aiohttp %s",
             hass.data["integrations"][DOMAIN].version,
             version("myPyllant"),
             version("homeassistant"),
-            version("dacite"),
+            version("pydantic"),
             version("aiohttp"),
         )
     username: str = entry.data.get("username")  # type: ignore

diff --git a/custom_components/mypyllant/config_flow.py b/custom_components/mypyllant/config_flow.py
@@ -138,19 +138,19 @@ async def async_step_init(
                             DEFAULT_HOLIDAY_DURATION,
                         ),
                     ): positive_int,
-                    vol.Required(
-                        OPTION_TIME_PROGRAM_OVERWRITE,
-                        default=self.config_entry.options.get(
-                            OPTION_TIME_PROGRAM_OVERWRITE,
-                            DEFAULT_TIME_PROGRAM_OVERWRITE,
-                        ),
-                    ): bool,
                     vol.Required(
                         OPTION_DEFAULT_HOLIDAY_SETPOINT,
                         default=self.config_entry.options.get(
                             OPTION_DEFAULT_HOLIDAY_SETPOINT,
                             DEFAULT_HOLIDAY_SETPOINT,
                         ),
+                    ): vol.All(vol.Coerce(float), vol.Clamp(min=0, max=30)),
+                    vol.Required(
+                        OPTION_TIME_PROGRAM_OVERWRITE,
+                        default=self.config_entry.options.get(
+                            OPTION_TIME_PROGRAM_OVERWRITE,
+                            DEFAULT_TIME_PROGRAM_OVERWRITE,
+                        ),
                     ): bool,
                     vol.Required(
                         OPTION_BRAND,

diff --git a/custom_components/mypyllant/manifest.json b/custom_components/mypyllant/manifest.json
@@ -10,7 +10,7 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/signalkraft/mypyllant-component/issues",
   "requirements": [
-    "myPyllant==0.7.21"
+    "myPyllant==0.7.22"
   ],
   "version": "v0.7.3"
 }
diff --git a/custom_components/mypyllant/translations/cs.json b/custom_components/mypyllant/translations/cs.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Nastavené trvání v hodinách pro rychlé veto",
           "holiday_duration": "Nastavená doba trvání dovolené ve dnech",
           "time_program_overwrite": "Regulátory teploty přepisují časový program namísto nastavení rychlého veta",
+          "default_holiday_setpoint": "Výchozí teplota pro dovolenou",
           "country": "Země",
           "brand": "Značka"
         }

diff --git a/custom_components/mypyllant/translations/de.json b/custom_components/mypyllant/translations/de.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Standard Dauer in Stunden für Quick Veto",
           "holiday_duration": "Standard Dauer in Tagen für Abwesenheitsmodus",
           "time_program_overwrite": "Temperaturänderungen in der Zeitsteuerung speichern, statt Quick Veto",
+          "default_holiday_setpoint": "Standardtemperatur während Abwesenheitsmodus",
           "country": "Land",
           "brand": "Hersteller"
         }

diff --git a/custom_components/mypyllant/translations/en.json b/custom_components/mypyllant/translations/en.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Default duration in hours for quick veto",
           "holiday_duration": "Default duration in days for away mode",
           "time_program_overwrite": "Temperature controls overwrite time program instead of setting quick veto",
+          "default_holiday_setpoint": "Default temperature setpoint for away mode",
           "country": "Country",
           "brand": "Brand"
         }

diff --git a/custom_components/mypyllant/translations/it.json b/custom_components/mypyllant/translations/it.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Durata di default in ore per l'acqua calda rapida",
           "holiday_duration": "Durata di default in giorni per le vacanze",
           "time_program_overwrite": "Controlla la temperatura sovrascrivendo la programmazione oraria invece di attivare acqua calda rapida",
+          "default_holiday_setpoint": "Temperatura di default per le vacanze",
           "country": "Stato",
           "brand": "Marca"
         }

diff --git a/custom_components/mypyllant/translations/pl.json b/custom_components/mypyllant/translations/pl.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Domyślny czas trwania szybkiego weta w godzinach",
           "holiday_duration": "Domyślny czas trwania wakacji w dniach",
           "time_program_overwrite": "Kontrola temperatury nadpisuje program czasowy zamiast ustawiać szybkie weto",
+          "default_holiday_setpoint": "Domyślna temperatura wakacyjna",
           "country": "Kraj",
           "brand": "Marka"
         }

diff --git a/custom_components/mypyllant/translations/sk.json b/custom_components/mypyllant/translations/sk.json
@@ -28,6 +28,7 @@
           "quick_veto_duration": "Predvolené trvanie v hodinách pre rýchle veto",
           "holiday_duration": "Predvolená doba trvania dovolenky v dňoch",
           "time_program_overwrite": "Regulátory teploty prepisujú časový program namiesto nastavenia rýchleho veta",
+          "default_holiday_setpoint": "Predvolená teplota počas dovolenky",
           "country": "Krajina",
           "brand": "Značka"
         }

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -11,8 +11,7 @@ types-PyYAML~=6.0.12.12
 
 # Need specific versions
 pytest-homeassistant-custom-component==0.13.101
-myPyllant==0.7.21
-dacite~=1.7.0
+myPyllant==0.7.22
 
 # Versions handled by pytest-homeassistant-custom-component
 freezegun