From 3adba7aa1f094386d50094edad790510b30afc94 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 6 Jan 2026 14:24:19 +0100 Subject: [PATCH] Fix translation loading of choose selector (#28817) --- src/components/ha-selector/ha-selector-choose.ts | 9 +++++++-- .../condition/types/ha-automation-condition-platform.ts | 3 +-- .../trigger/types/ha-automation-trigger-platform.ts | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/ha-selector/ha-selector-choose.ts b/src/components/ha-selector/ha-selector-choose.ts index 5b86712b74..a7ba8430b2 100644 --- a/src/components/ha-selector/ha-selector-choose.ts +++ b/src/components/ha-selector/ha-selector-choose.ts @@ -54,7 +54,8 @@ export class HaChooseSelector extends LitElement { size="small" .buttons=${this._toggleButtons( this.selector.choose.choices, - this.selector.choose.translation_key + this.selector.choose.translation_key, + this.hass.localize )} .active=${this._activeChoice} @value-changed=${this._choiceChanged} @@ -72,7 +73,11 @@ export class HaChooseSelector extends LitElement { } private _toggleButtons = memoizeOne( - (choices: ChooseSelector["choose"]["choices"], translationKey?: string) => + ( + choices: ChooseSelector["choose"]["choices"], + translationKey?: string, + _localize?: HomeAssistant["localize"] + ) => Object.keys(choices).map((choice) => ({ label: this.localizeValue && translationKey diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-platform.ts b/src/panels/config/automation/condition/types/ha-automation-condition-platform.ts index d425048f18..3874ec30c8 100644 --- a/src/panels/config/automation/condition/types/ha-automation-condition-platform.ts +++ b/src/panels/config/automation/condition/types/ha-automation-condition-platform.ts @@ -4,7 +4,6 @@ import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../../../common/dom/fire_event"; -import { computeDomain } from "../../../../../common/entity/compute_domain"; import "../../../../../components/ha-checkbox"; import "../../../../../components/ha-selector/ha-selector"; import "../../../../../components/ha-settings-row"; @@ -378,7 +377,7 @@ export class HaPlatformCondition extends LitElement { return ""; } return this.hass.localize( - `component.${computeDomain(this.condition.condition)}.selector.${key}` + `component.${getConditionDomain(this.condition.condition)}.selector.${key}` ); }; diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts index c61ad3a704..8ef8facae1 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts @@ -4,7 +4,6 @@ import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../../../common/dom/fire_event"; -import { computeDomain } from "../../../../../common/entity/compute_domain"; import "../../../../../components/ha-checkbox"; import "../../../../../components/ha-selector/ha-selector"; import "../../../../../components/ha-settings-row"; @@ -414,7 +413,7 @@ export class HaPlatformTrigger extends LitElement { return ""; } return this.hass.localize( - `component.${computeDomain(this.trigger.trigger)}.selector.${key}` + `component.${getTriggerDomain(this.trigger.trigger)}.selector.${key}` ); };