Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
19 changes: 11 additions & 8 deletions src/panels/lovelace/components/hui-generic-entity-row.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,17 @@ class HuiGenericEntityRow extends LitElement {
.datetime=${stateObj.last_changed}
></ha-relative-time>
`
: this.config.secondary_info === "last-triggered" &&
stateObj.attributes.last_triggered
? html`
<ha-relative-time
.hass=${this.hass}
.datetime=${stateObj.attributes.last_triggered}
></ha-relative-time>
`
: this.config.secondary_info === "last-triggered"
? stateObj.attributes.last_triggered
? html`
<ha-relative-time
.hass=${this.hass}
.datetime=${stateObj.attributes.last_triggered}
></ha-relative-time>
`
: this.hass.localize(
"ui.panel.lovelace.entities.never_triggered"
Comment thread
iantrich marked this conversation as resolved.
Outdated
Comment thread
Mariusthvdb marked this conversation as resolved.
Outdated
)
: ""}
Comment thread
Mariusthvdb marked this conversation as resolved.
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
},
"automation": {
"last_triggered": "Last triggered",
"never_triggered":"Never triggered",
"trigger": "Execute"
},
"camera": {
Expand Down Expand Up @@ -458,6 +459,8 @@
"activate": "Activate"
},
"script": {
"last_triggered": "Last triggered",
"never_triggered":"Never triggered",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these two. You are not using them.

"execute": "Execute"
},
"timer": {
Expand Down