Skip to content

Fix duplicate 'triggered' text in Logbook context messages (#23083) #51508

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

Draft
ellegamee wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Fix duplicate 'triggered' text in Logbook context messages (#23083) #51508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 5 additions & 18 deletions src/panels/logbook/ha-logbook-renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,14 +422,6 @@ class HaLogbookRenderer extends LitElement {
item.context_event_type === "automation_triggered" ||
item.context_event_type === "script_started"
) {
// context_source is available in 2022.6 and later
const triggerMsg = item.context_source
? item.context_source
: item.context_message.replace("triggered by ", "");
const contextTriggerSource = localizeTriggerSource(
this.hass.localize,
triggerMsg
);
return html`${this.hass.localize(
item.context_event_type === "automation_triggered"
? "ui.components.logbook.triggered_by_automation"
Expand All @@ -439,22 +431,17 @@ class HaLogbookRenderer extends LitElement {
item.context_entity_id,
item.context_entity_id_name,
noLink
)}
${item.context_message
? this._formatMessageWithPossibleEntity(
contextTriggerSource,
seenEntityIds,
undefined,
noLink
)
: ""}`;
)} `;
}
// Generic externally described logbook platform
// These are not localizable
// Check if the message is just a repeat of "triggered"
const cleanMessage =
item.context_message === "triggered" ? "" : item.context_message;
return html` ${this.hass.localize("ui.components.logbook.triggered_by")}
${item.context_name}
${this._formatMessageWithPossibleEntity(
item.context_message,
cleanMessage,
seenEntityIds,
item.context_entity_id,
noLink
Expand Down
Loading