diff --git a/src/data/automation_i18n.ts b/src/data/automation_i18n.ts index 30f4ee03bf..b123894cad 100644 --- a/src/data/automation_i18n.ts +++ b/src/data/automation_i18n.ts @@ -202,15 +202,16 @@ export const describeTrigger = ( // Time Trigger if (trigger.platform === "time" && trigger.at) { - const at = trigger.at.includes(".") - ? `entity ${ - hass.states[trigger.at] - ? computeStateName(hass.states[trigger.at]) - : trigger.at - }` - : trigger.at; + const result = ensureArray(trigger.at).map((at) => + at.toString().includes(".") + ? `entity ${hass.states[at] ? computeStateName(hass.states[at]) : at}` + : at + ); - return `When the time is equal to ${at}`; + const last = result.splice(-1, 1)[0]; + return `When the time is equal to ${ + result.length ? `${result.join(", ")} or ` : "" + }${last}`; } // Time Patter Trigger