From 8bd09edec02cd614abe77ca5954313d825b39b67 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 5 Jul 2023 13:27:38 +0200 Subject: [PATCH] Fix automation translations + gallery (#17166) --- gallery/src/pages/automation/describe-action.ts | 1 + gallery/src/pages/automation/describe-condition.ts | 1 + gallery/src/pages/automation/describe-trigger.ts | 2 ++ src/data/automation_i18n.ts | 10 ++++------ src/data/script_i18n.ts | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gallery/src/pages/automation/describe-action.ts b/gallery/src/pages/automation/describe-action.ts index 9735880916..7deccf6927 100644 --- a/gallery/src/pages/automation/describe-action.ts +++ b/gallery/src/pages/automation/describe-action.ts @@ -162,6 +162,7 @@ export class DemoAutomationDescribeAction extends LitElement { super.firstUpdated(changedProps); const hass = provideHass(this); hass.updateTranslations(null, "en"); + hass.updateTranslations("config", "en"); hass.addEntities(ENTITIES); } diff --git a/gallery/src/pages/automation/describe-condition.ts b/gallery/src/pages/automation/describe-condition.ts index fe089ba861..a92fc724b4 100644 --- a/gallery/src/pages/automation/describe-condition.ts +++ b/gallery/src/pages/automation/describe-condition.ts @@ -89,6 +89,7 @@ export class DemoAutomationDescribeCondition extends LitElement { super.firstUpdated(changedProps); const hass = provideHass(this); hass.updateTranslations(null, "en"); + hass.updateTranslations("config", "en"); hass.addEntities(ENTITIES); } diff --git a/gallery/src/pages/automation/describe-trigger.ts b/gallery/src/pages/automation/describe-trigger.ts index f86c452340..476df57267 100644 --- a/gallery/src/pages/automation/describe-trigger.ts +++ b/gallery/src/pages/automation/describe-trigger.ts @@ -40,6 +40,7 @@ const triggers = [ }, { platform: "sun", event: "sunset" }, { platform: "time_pattern" }, + { platform: "time_pattern", hours: "*", minutes: "/5", seconds: "10" }, { platform: "webhook" }, { platform: "persistent_notification" }, { @@ -105,6 +106,7 @@ export class DemoAutomationDescribeTrigger extends LitElement { super.firstUpdated(changedProps); const hass = provideHass(this); hass.updateTranslations(null, "en"); + hass.updateTranslations("config", "en"); hass.addEntities(ENTITIES); } diff --git a/src/data/automation_i18n.ts b/src/data/automation_i18n.ts index d4dc798892..2a513936f2 100644 --- a/src/data/automation_i18n.ts +++ b/src/data/automation_i18n.ts @@ -397,12 +397,10 @@ const tryDescribeTrigger = ( } // Time Pattern Trigger - if ( - trigger.platform === "time_pattern" && - (trigger.seconds !== undefined || - trigger.minutes !== undefined || - trigger.hours !== undefined) - ) { + if (trigger.platform === "time_pattern") { + if (!trigger.seconds && !trigger.minutes && !trigger.hours) { + return "When a time pattern matches"; + } let result = "Trigger "; if (trigger.seconds !== undefined) { const seconds_all = trigger.seconds === "*"; diff --git a/src/data/script_i18n.ts b/src/data/script_i18n.ts index 42a97acd38..3cd8a36818 100644 --- a/src/data/script_i18n.ts +++ b/src/data/script_i18n.ts @@ -189,7 +189,7 @@ const tryDescribeAction = ( duration = hass.localize( `${actionTranslationBaseKey}.delay.description.duration_string`, { - duration: secondsToDuration(config.delay)!, + string: secondsToDuration(config.delay)!, } ); } else if (typeof config.delay === "string") { @@ -200,7 +200,7 @@ const tryDescribeAction = ( : hass.localize( `${actionTranslationBaseKey}.delay.description.duration_string`, { - duration: + string: config.delay || hass.localize( `${actionTranslationBaseKey}.delay.description.duration_unknown` @@ -211,14 +211,14 @@ const tryDescribeAction = ( duration = hass.localize( `${actionTranslationBaseKey}.delay.description.duration_string`, { - duration: formatDuration(config.delay), + string: formatDuration(config.delay), } ); } else { duration = hass.localize( `${actionTranslationBaseKey}.delay.description.duration_string`, { - duration: hass.localize( + string: hass.localize( `${actionTranslationBaseKey}.delay.description.duration_unknown` ), }