Skip to content

Commit 5db2e6c

Browse files
committed
Merge remote-tracking branch 'origin/main' into pr-sync-1462
2 parents 35405cb + c4b8e28 commit 5db2e6c

28 files changed

Lines changed: 104 additions & 42 deletions

.github/update-strings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
en["config"]["step"]["user"] = strings["config"]["step"]["user"]
6161
en["options"]["step"]["init"]["data"] = data
6262
en["options"]["step"]["init"]["data_description"] = data_description
63+
en["options"]["step"]["init"]["description"] = strings["options"]["step"]["init"][
64+
"description"
65+
]
6366
en["services"] = services_json
6467

6568
with en_fname.open("w") as f:

.github/workflows/pytest.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,18 @@ jobs:
3838
python-version: "3.13"
3939
- core-version: "2025.11.3"
4040
python-version: "3.13"
41-
- core-version: "dev"
41+
- core-version: "2025.12.5"
42+
python-version: "3.13"
43+
- core-version: "2026.1.3"
4244
python-version: "3.13"
45+
- core-version: "2026.2.3"
46+
python-version: "3.13"
47+
- core-version: "2026.3.4"
48+
python-version: "3.14.2"
49+
- core-version: "2026.4.3"
50+
python-version: "3.14.2"
51+
- core-version: "dev"
52+
python-version: "3.14.2"
4353
steps:
4454
- name: Check out code from GitHub
4555
uses: actions/checkout@v6

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN ln -s /core /app/core && /app/scripts/setup-symlinks
2828

2929
# Install home-assistant/core dependencies
3030
RUN mkdir -p /.venv
31-
ENV UV_PROJECT_ENVIRONMENT=/.venv UV_PYTHON=3.13 PATH="/.venv/bin:$PATH"
31+
ENV UV_PROJECT_ENVIRONMENT=/.venv UV_PYTHON=3.14.2 PATH="/.venv/bin:$PATH"
3232
RUN uv venv
3333
RUN /app/scripts/setup-dependencies
3434

custom_components/adaptive_lighting/config_flow.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020

2121
_LOGGER = logging.getLogger(__name__)
2222

23+
OPTIONS_FLOW_DESCRIPTION_PLACEHOLDERS = {
24+
"webapp_url": "https://basnijholt.github.io/adaptive-lighting",
25+
"docs_url": "https://github.com/basnijholt/adaptive-lighting#readme",
26+
}
27+
2328

2429
class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
2530
"""Handle a config flow for Adaptive Lighting."""
@@ -127,7 +132,11 @@ async def async_step_init(self, user_input: dict[str, Any] | None = None):
127132
conf = self.config_entry
128133
data = validate(conf)
129134
if conf.source == config_entries.SOURCE_IMPORT:
130-
return self.async_show_form(step_id="init", data_schema=None)
135+
return self.async_show_form(
136+
step_id="init",
137+
data_schema=None,
138+
description_placeholders=OPTIONS_FLOW_DESCRIPTION_PLACEHOLDERS,
139+
)
131140
errors: dict[str, str] = {}
132141
if user_input is not None:
133142
validate_options(user_input, errors)
@@ -164,4 +173,5 @@ async def async_step_init(self, user_input: dict[str, Any] | None = None):
164173
step_id="init",
165174
data_schema=vol.Schema(options_schema),
166175
errors=errors,
176+
description_placeholders=OPTIONS_FLOW_DESCRIPTION_PLACEHOLDERS,
167177
)

custom_components/adaptive_lighting/strings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"step": {
2525
"init": {
2626
"title": "Adaptive Lighting options",
27-
"description": "Configure an Adaptive Lighting component. Option names align with the YAML settings. If you've defined this entry in YAML, no options will appear here. For interactive graphs that demonstrate parameter effects, visit [this web app](https://basnijholt.github.io/adaptive-lighting). For further details, see the [official documentation](https://github.com/basnijholt/adaptive-lighting#readme).",
27+
"description": "Configure an Adaptive Lighting component. Option names align with the YAML settings. If you've defined this entry in YAML, no options will appear here. For interactive graphs that demonstrate parameter effects, visit [this web app]({webapp_url}). For further details, see the [official documentation]({docs_url}).",
2828
"data": {
2929
"lights": "lights: List of light entity_ids to be controlled (may be empty). 🌟",
3030
"interval": "interval",

custom_components/adaptive_lighting/translations/bg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"step": {
1919
"init": {
2020
"title": "Настройки на Адаптивно осветление",
21-
"description": "Конфигурирайте компонент за Адаптивно осветление. Имената на опциите съвпадат с настройките на YAML. Ако сте дефинирали този запис в YAML, няма да се появят опции тук. За интерактивни графики, които демонстрират ефектите на параметрите, посетете [това уеб приложение](https://basnijholt.github.io/adaptive-lighting). За повече подробности, вижте [официалната документация](https://github.com/basnijholt/adaptive-lighting#readme).",
21+
"description": "Конфигурирайте компонент за Адаптивно осветление. Имената на опциите съвпадат с настройките на YAML. Ако сте дефинирали този запис в YAML, няма да се появят опции тук. За интерактивни графики, които демонстрират ефектите на параметрите, посетете [това уеб приложение]({webapp_url}). За повече подробности, вижте [официалната документация]({docs_url}).",
2222
"data": {
2323
"lights": "lights: Списък от entity_ids на лампи за контрол (може да е празен). 🌟",
2424
"interval": "интервал",

custom_components/adaptive_lighting/translations/ca.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"intercept": "intercept: Intercepta i adapta les crides `light.turn_on` per permetre canvis instantanis de color i brillantor. 🏎️ Inhabilita-ho per a llums que no admeten `light.turn_on` amb color i brillantor.",
4747
"skip_redundant_commands": "skip_redundant_commands: Evita l'enviament de d'ordres d'adaptació als objectius on el seu estat ja és el conegut del llum. Minimitza el trànsit de la xarxa i millora la resposta de l'adaptació en alguns casos. 📉 Inhabilita-ho si l'estat físic del llum queda desincronitzat amb l'estat registrat a Home Assistant."
4848
},
49-
"description": "Configura un component d'Adaptive Lighting. Els noms de les opcions s'alineen amb la configuració de YAML. Si has definit aquesta entrada a YAML, aquí no apareixerà cap opció. Per veure gràfics interactius que demostren efectes de paràmetres, visita [aquesta aplicació web] (https://basnijholt.github.io/adaptive-lighting). Per a més detalls, pots veure la [documentació oficial] (https://github.com/basnijholt/adaptive-lighting#readme)."
49+
"description": "Configura un component d'Adaptive Lighting. Els noms de les opcions s'alineen amb la configuració de YAML. Si has definit aquesta entrada a YAML, aquí no apareixerà cap opció. Per veure gràfics interactius que demostren efectes de paràmetres, visita [aquesta aplicació web]({webapp_url}). Per a més detalls, pots veure la [documentació oficial]({docs_url})."
5050
}
5151
},
5252
"error": {

custom_components/adaptive_lighting/translations/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"step": {
2626
"init": {
2727
"title": "Optionen für Adaptive Beleuchtung",
28-
"description": "Alle Einstellungen für eine Adaptive Lighting Komponente. Die Optionsnamen entsprechen den YAML-Einstellungen. Es werden keine Optionen angezeigt, wenn dieser Eintrag in YAML konfiguriert wurde. Interaktive Diagramme zur Veranschaulichung der Auswirkungen der Parameter finden Sie unter [dieser Webanwendung](https://basnijholt.github.io/adaptive-lighting). Weitere Details finden Sie in der [offiziellen Dokumentation](https://github.com/basnijholt/adaptive-lighting#readme).",
28+
"description": "Alle Einstellungen für eine Adaptive Lighting Komponente. Die Optionsnamen entsprechen den YAML-Einstellungen. Es werden keine Optionen angezeigt, wenn dieser Eintrag in YAML konfiguriert wurde. Interaktive Diagramme zur Veranschaulichung der Auswirkungen der Parameter finden Sie unter [dieser Webanwendung]({webapp_url}). Weitere Details finden Sie in der [offiziellen Dokumentation]({docs_url}).",
2929
"data": {
3030
"lights": "Lichter",
3131
"initial_transition": "initial_transition, wenn Lichter von 'off' zu 'on' wechseln oder wenn 'sleep_state' wechselt",

custom_components/adaptive_lighting/translations/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"step": {
2626
"init": {
2727
"title": "Adaptive Lighting options",
28-
"description": "Configure an Adaptive Lighting component. Option names align with the YAML settings. If you've defined this entry in YAML, no options will appear here. For interactive graphs that demonstrate parameter effects, visit [this web app](https://basnijholt.github.io/adaptive-lighting). For further details, see the [official documentation](https://github.com/basnijholt/adaptive-lighting#readme).",
28+
"description": "Configure an Adaptive Lighting component. Option names align with the YAML settings. If you've defined this entry in YAML, no options will appear here. For interactive graphs that demonstrate parameter effects, visit [this web app]({webapp_url}). For further details, see the [official documentation]({docs_url}).",
2929
"data": {
3030
"lights": "lights: List of light entity_ids to be controlled (may be empty). 🌟",
3131
"interval": "interval",

custom_components/adaptive_lighting/translations/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"skip_redundant_commands": "skip_redundant_commands: Evitar mandar comandos de adaptación a luces cuyo estado ya sea el esperado. Reduce tráfico en la red y mejora la respuesta de la adaptación en ciertas situaciones. 📉Deshabilitar si el estado real de las luces se desincroniza con el estado registrado en Home Assistant.",
4747
"take_over_control": "take_over_control: Deshabilita Adaptive Lighting si otra fuente llama`light.turn_on` mientras las luces están encendidas y adaptándose. Cuidado, esto llama`homeassistant.update_entity` cada `interval`! 🔒"
4848
},
49-
"description": "Configura un componente Adaptive Lighting. Los nombres de las opciones se asemejan a las disponibles en la configuración YAML. Si has definido esta entrada en YAML, no aparecerá ninguna opción aquí. Para gráficos interactivos que demuestran los efectos de los parámetros, visita [esta web app](https://basnijholt.github.io/adaptive-lighting). Para más detalles, ver la [documentación oficial](https://github.com/basnijholt/adaptive-lighting#readme)."
49+
"description": "Configura un componente Adaptive Lighting. Los nombres de las opciones se asemejan a las disponibles en la configuración YAML. Si has definido esta entrada en YAML, no aparecerá ninguna opción aquí. Para gráficos interactivos que demuestran los efectos de los parámetros, visita [esta web app]({webapp_url}). Para más detalles, ver la [documentación oficial]({docs_url})."
5050
}
5151
},
5252
"error": {

0 commit comments

Comments
 (0)