Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation support for device automation extra fields #20567

Merged
merged 4 commits into from
Jun 12, 2024
Merged

Translation support for device automation extra fields #20567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f25b72
Translation support for device trigger extra fields
farmio Apr 20, 2024
83c55d1
Prefer component translation over default
farmio Apr 22, 2024
9d3ebe1
Move device trigger extra_fields translations to backend
farmio Apr 22, 2024
c64fe6f
move translations for extra_fields of conditions and actions too
farmio Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/data/device_automation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,22 @@ export const localizeDeviceAutomationTrigger = (
) ||
(trigger.subtype ? `"${trigger.subtype}" ${trigger.type}` : trigger.type!);

export const localizeExtraFieldsComputeLabelCallback =
(hass: HomeAssistant, deviceAutomation: DeviceAutomation) =>
// Returns a callback for ha-form to calculate labels per schema object
(schema): string =>
hass.localize(
`component.${deviceAutomation.domain}.device_automation.extra_fields.${schema.name}`
) || schema.name;

export const localizeExtraFieldsComputeHelperCallback =
(hass: HomeAssistant, deviceAutomation: DeviceAutomation) =>
// Returns a callback for ha-form to calculate helper texts per schema object
(schema): string | undefined =>
hass.localize(
`component.${deviceAutomation.domain}.device_automation.extra_fields_descriptions.${schema.name}`
);

export const sortDeviceAutomations = (
automationA: DeviceAutomation,
automationB: DeviceAutomation
Expand Down
19 changes: 9 additions & 10 deletions src/panels/config/automation/action/types/ha-automation-action-device_id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
deviceAutomationsEqual,
DeviceCapabilities,
fetchDeviceActionCapabilities,
localizeExtraFieldsComputeLabelCallback,
localizeExtraFieldsComputeHelperCallback,
} from "../../../../../data/device_automation";
import { EntityRegistryEntry } from "../../../../../data/entity_registry";
import { HomeAssistant } from "../../../../../types";
Expand Down Expand Up @@ -84,8 +86,13 @@ export class HaDeviceAction extends LitElement {
.data=${this._extraFieldsData(this.action, this._capabilities)}
.schema=${this._capabilities.extra_fields}
.disabled=${this.disabled}
.computeLabel=${this._extraFieldsComputeLabelCallback(
this.hass.localize
.computeLabel=${localizeExtraFieldsComputeLabelCallback(
this.hass,
this.action
)}
.computeHelper=${localizeExtraFieldsComputeHelperCallback(
this.hass,
this.action
)}
@value-changed=${this._extraFieldsChanged}
></ha-form>
Expand Down Expand Up @@ -152,14 +159,6 @@ export class HaDeviceAction extends LitElement {
});
}

private _extraFieldsComputeLabelCallback(localize) {
// Returns a callback for ha-form to calculate labels per schema object
return (schema) =>
localize(
`ui.panel.config.automation.editor.actions.type.device_id.extra_fields.${schema.name}`
) || schema.name;
}

static styles = css`
ha-device-picker {
display: block;
Expand Down
19 changes: 9 additions & 10 deletions src/panels/config/automation/condition/types/ha-automation-condition-device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
DeviceCapabilities,
DeviceCondition,
fetchDeviceConditionCapabilities,
localizeExtraFieldsComputeLabelCallback,
localizeExtraFieldsComputeHelperCallback,
} from "../../../../../data/device_automation";
import { EntityRegistryEntry } from "../../../../../data/entity_registry";
import type { HomeAssistant } from "../../../../../types";
Expand Down Expand Up @@ -84,8 +86,13 @@ export class HaDeviceCondition extends LitElement {
.data=${this._extraFieldsData(this.condition, this._capabilities)}
.schema=${this._capabilities.extra_fields}
.disabled=${this.disabled}
.computeLabel=${this._extraFieldsComputeLabelCallback(
this.hass.localize
.computeLabel=${localizeExtraFieldsComputeLabelCallback(
this.hass,
this.condition
)}
.computeHelper=${localizeExtraFieldsComputeHelperCallback(
this.hass,
this.condition
)}
@value-changed=${this._extraFieldsChanged}
></ha-form>
Expand Down Expand Up @@ -153,14 +160,6 @@ export class HaDeviceCondition extends LitElement {
});
}

private _extraFieldsComputeLabelCallback(localize) {
// Returns a callback for ha-form to calculate labels per schema object
return (schema) =>
localize(
`ui.panel.config.automation.editor.conditions.type.device.extra_fields.${schema.name}`
) || schema.name;
}

static styles = css`
ha-device-picker {
display: block;
Expand Down
19 changes: 9 additions & 10 deletions src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import {
DeviceCapabilities,
DeviceTrigger,
fetchDeviceTriggerCapabilities,
localizeExtraFieldsComputeLabelCallback,
localizeExtraFieldsComputeHelperCallback,
} from "../../../../../data/device_automation";
import { EntityRegistryEntry } from "../../../../../data/entity_registry";
import { HomeAssistant } from "../../../../../types";
Expand Down Expand Up @@ -88,8 +90,13 @@ export class HaDeviceTrigger extends LitElement {
.data=${this._extraFieldsData(this.trigger, this._capabilities)}
.schema=${this._capabilities.extra_fields}
.disabled=${this.disabled}
.computeLabel=${this._extraFieldsComputeLabelCallback(
this.hass.localize
.computeLabel=${localizeExtraFieldsComputeLabelCallback(
this.hass,
this.trigger
)}
.computeHelper=${localizeExtraFieldsComputeHelperCallback(
this.hass,
this.trigger
)}
@value-changed=${this._extraFieldsChanged}
></ha-form>
Expand Down Expand Up @@ -177,14 +184,6 @@ export class HaDeviceTrigger extends LitElement {
});
}

private _extraFieldsComputeLabelCallback(localize) {
// Returns a callback for ha-form to calculate labels per schema object
return (schema) =>
localize(
`ui.panel.config.automation.editor.triggers.type.device.extra_fields.${schema.name}`
) || schema.name;
}

static styles = css`
ha-device-picker {
display: block;
Expand Down
24 changes: 0 additions & 24 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,12 +2862,6 @@
"device": {
"label": "Device",
"trigger": "Trigger",
"extra_fields": {
"above": "Above",
"below": "Below",
"for": "Duration (optional)",
"zone": "[%key:ui::panel::config::automation::editor::triggers::type::zone::label%]"
},
"description": {
"picker": "When something happens to a device. Great way to start."
}
Expand Down Expand Up @@ -3105,13 +3099,6 @@
"device": {
"label": "Device",
"condition": "Condition",
"extra_fields": {
"above": "Above",
"below": "Below",
"for": "Duration",
"hvac_mode": "HVAC mode",
"preset_mode": "Preset mode"
},
"description": {
"picker": "Set of conditions provided by your device. Great way to start."
}
Expand Down Expand Up @@ -3342,17 +3329,6 @@
"device_id": {
"label": "Device",
"action": "Action",
"extra_fields": {
"code": "Code",
"message": "Message",
"title": "Title",
"position": "[%key:ui::card::cover::position%]",
"mode": "Mode",
"humidity": "Humidity",
"value": "Value",
"brightness_pct": "[%key:ui::card::light::brightness%]",
"flash": "Flash"
},
"description": {
"picker": "Do something on a device. Great way to start.",
"no_device": "Device action"
Expand Down
Loading