From d33e035db784853f3bd0d305532e500089c8ec0d Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Tue, 11 Feb 2020 13:11:25 -0500 Subject: [PATCH 01/26] Update Media Card to check for supported features --- src/data/media-player.ts | 9 ++ .../lovelace/cards/hui-media-control-card.ts | 84 +++++++++++++------ 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/src/data/media-player.ts b/src/data/media-player.ts index 3aaf16e093..cfb17c91c5 100644 --- a/src/data/media-player.ts +++ b/src/data/media-player.ts @@ -3,8 +3,17 @@ import { HomeAssistant } from "../types"; import { timeCachePromiseFunc } from "../common/util/time-cache-function-promise"; export const SUPPORT_PAUSE = 1; +export const SUPPORT_VOLUME_SET = 4; +export const SUPPORT_VOLUME_MUTE = 8; +export const SUPPORT_PREVIOUS_TRACK = 16; export const SUPPORT_NEXT_TRACK = 32; +export const SUPPORT_TURN_ON = 128; +export const SUPPORT_TURN_OFF = 256; +export const SUPPORT_PLAY_MEDIA = 512; +export const SUPPORT_VOLUME_BUTTONS = 1024; +export const SUPPORT_SELECT_SOURCE = 2048; export const SUPPORTS_PLAY = 16384; +export const SUPPORT_SELECT_SOUND_MODE = 65536; export const OFF_STATES = ["off", "idle"]; export interface MediaPlayerThumbnail { diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index c5035a9c58..159efa1c54 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -16,7 +16,15 @@ import "../../../components/ha-card"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; import { computeStateName } from "../../../common/entity/compute_state_name"; import { supportsFeature } from "../../../common/entity/supports-feature"; -import { OFF_STATES, SUPPORT_PAUSE } from "../../../data/media-player"; +import { + OFF_STATES, + SUPPORT_PAUSE, + SUPPORT_TURN_ON, + SUPPORT_TURN_OFF, + SUPPORT_PREVIOUS_TRACK, + SUPPORT_NEXT_TRACK, + SUPPORTS_PLAY, +} from "../../../data/media-player"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { HomeAssistant, MediaEntity } from "../../../types"; import { LovelaceCard, LovelaceCardEditor } from "../types"; @@ -89,7 +97,9 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { - ${OFF_STATES.includes(stateObj.state) + ${OFF_STATES.includes(stateObj.state) || + !stateObj.attributes.media_duration || + !stateObj.attributes.media_position ? "" : html` `}
- + ${(stateObj.state === "off" && + !supportsFeature(stateObj, SUPPORT_TURN_ON)) || + (stateObj.state === "on" && + !supportsFeature(stateObj, SUPPORT_TURN_OFF)) + ? "" + : html` + + `}
- - - + ${!supportsFeature(stateObj, SUPPORT_PREVIOUS_TRACK) + ? "" + : html` + + `} + ${stateObj.state !== "playing" && + !supportsFeature(stateObj, SUPPORTS_PLAY) + ? "" + : html` + + `} + ${!supportsFeature(stateObj, SUPPORT_NEXT_TRACK) + ? "" + : html` + + `}
Date: Thu, 13 Feb 2020 16:30:34 -0500 Subject: [PATCH 02/26] Review Updates --- .../lovelace/cards/hui-media-control-card.ts | 69 ++++++++++++------- src/types.ts | 1 + 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 159efa1c54..0973b27f26 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -89,12 +89,21 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { })}" >
-
+
${this._config!.name || computeStateName(this.hass!.states[this._config!.entity])}
- ${this._computeMediaTitle(stateObj)} + ${stateObj.attributes.media_title || + this.hass.localize(`state.media_player.${stateObj.state}`) || + this.hass.localize(`state.default.${stateObj.state}`) || + stateObj.state}
+ ${this._computeSecondaryTitle(stateObj)}
${OFF_STATES.includes(stateObj.state) || @@ -116,7 +125,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { ? "" : html` @@ -126,18 +135,20 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { ? "" : html` `} - ${stateObj.state !== "playing" && - !supportsFeature(stateObj, SUPPORTS_PLAY) + ${(stateObj.state !== "playing" && + !supportsFeature(stateObj, SUPPORTS_PLAY)) || + stateObj.state === "unavailable" ? "" : html` `}
@@ -190,30 +201,30 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { } } - private _computeMediaTitle(stateObj: HassEntity): string { - let prefix; - let suffix; + private _computeSecondaryTitle(stateObj: HassEntity): string { + let secondaryTitle: string; switch (stateObj.attributes.media_content_type) { case "music": - prefix = stateObj.attributes.media_artist; - suffix = stateObj.attributes.media_title; + secondaryTitle = stateObj.attributes.media_artist; break; case "tvshow": - prefix = stateObj.attributes.media_series_title; - suffix = stateObj.attributes.media_title; + secondaryTitle = stateObj.attributes.media_series_title; + if (stateObj.attributes.media_season) { + secondaryTitle += " S" + stateObj.attributes.media_season; + + if (stateObj.attributes.media_episode) { + secondaryTitle += "E" + stateObj.attributes.media_episode; + } + } break; default: - prefix = - stateObj.attributes.media_title || - stateObj.attributes.app_name || - this.hass!.localize(`state.media_player.${stateObj.state}`) || - this.hass!.localize(`state.default.${stateObj.state}`) || - stateObj.state; - suffix = ""; + secondaryTitle = stateObj.attributes.app_name + ? stateObj.attributes.app_name + : ""; } - return prefix && suffix ? `${prefix}: ${suffix}` : prefix || suffix || ""; + return secondaryTitle; } private _handleMoreInfo() { @@ -235,6 +246,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { width: 100%; height: 0; padding-bottom: 56.25%; + transition: padding-bottom 0.8s; } .image { @@ -282,12 +294,14 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { width: 44px; height: 44px; } + paper-icon-button { opacity: var(--dark-primary-opacity); } paper-icon-button[disabled] { opacity: var(--dark-disabled-opacity); + background-color: rgba(0, 0, 0, var(--dark-disabled-opacity)); } .playPauseButton { @@ -313,9 +327,16 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { transition: background-color 0.5s; } + .caption.unavailable { + background-color: rgba(0, 0, 0, var(--dark-secondary-opacity)); + } + .title { font-size: 1.2em; margin: 8px 0 4px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } .progress { diff --git a/src/types.ts b/src/types.ts index 9cef34e771..1e8626bec6 100644 --- a/src/types.ts +++ b/src/types.ts @@ -204,6 +204,7 @@ export type MediaEntity = HassEntityBase & { attributes: HassEntityAttributeBase & { media_duration: number; media_position: number; + media_title: string; }; }; From f6b10232ec317b6ba3593d047f3d8ca3e847a110 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Thu, 13 Feb 2020 16:35:16 -0500 Subject: [PATCH 03/26] Disabled Style Updates --- src/panels/lovelace/cards/hui-media-control-card.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 0973b27f26..531d8a70bb 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -136,6 +136,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { : html` @@ -162,6 +163,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { : html` @@ -301,7 +303,6 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { paper-icon-button[disabled] { opacity: var(--dark-disabled-opacity); - background-color: rgba(0, 0, 0, var(--dark-disabled-opacity)); } .playPauseButton { @@ -314,6 +315,10 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { transition: background-color 0.5s; } + .playPauseButton[disabled] { + background-color: rgba(0, 0, 0, var(--dark-disabled-opacity)); + } + .caption { position: absolute; left: 0; From 67706a312d9a68b8933cdb6328e79d62acef0643 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Sun, 16 Feb 2020 12:11:18 -0500 Subject: [PATCH 04/26] Support for requesting the image from the server --- .../lovelace/cards/hui-media-control-card.ts | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 531d8a70bb..ba42dc3041 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -24,6 +24,7 @@ import { SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK, SUPPORTS_PLAY, + fetchMediaPlayerThumbnailWithCache, } from "../../../data/media-player"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { HomeAssistant, MediaEntity } from "../../../types"; @@ -46,6 +47,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { @property() public hass?: HomeAssistant; @property() private _config?: MediaControlCardConfig; + @property() private _image?: string; public getCardSize(): number { return 3; @@ -76,19 +78,19 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { > `; } - const image = - stateObj.attributes.entity_picture || - "../static/images/card_media_player_bg.png"; return html`
-
+
{ + this._image = `data:${content_type};base64,${content}`; + } + ); } private _computeSecondaryTitle(stateObj: HassEntity): string { @@ -272,6 +295,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { background-repeat: no-repeat; background-color: var(--primary-color); background-size: initial; + background-image: "url(../static/images/card_media_player_bg.png)"; } .no-image > .caption { From 30e56118124537d7882f3d4016eaae3ff6332d0f Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Sun, 16 Feb 2020 12:15:56 -0500 Subject: [PATCH 05/26] Stupid mistake --- src/panels/lovelace/cards/hui-media-control-card.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index ba42dc3041..5b2e32358e 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -79,6 +79,8 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { `; } + const picture = this._image || "../static/images/card_media_player_bg.png"; + return html`
.caption { From 51ce481e7797ed5cab378fc50a5d9fedbffc7f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 16 Feb 2020 23:32:47 +0200 Subject: [PATCH 06/26] Sort list of available events --- src/panels/developer-tools/event/events-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/developer-tools/event/events-list.js b/src/panels/developer-tools/event/events-list.js index e2435c0dab..abf216b39a 100644 --- a/src/panels/developer-tools/event/events-list.js +++ b/src/panels/developer-tools/event/events-list.js @@ -58,7 +58,7 @@ class EventsList extends EventsMixin(LocalizeMixin(PolymerElement)) { super.connectedCallback(); this.hass.callApi("GET", "events").then( function(events) { - this.events = events; + this.events = events.sort((e1, e2) => compare(e1.event, e2.event)); }.bind(this) ); } From 2718ada9f96be1fe362e37fa0c27a2372af02899 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Mon, 17 Feb 2020 10:01:01 -0500 Subject: [PATCH 07/26] Review updates --- src/data/media-player.ts | 1 + .../lovelace/cards/hui-media-control-card.ts | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/data/media-player.ts b/src/data/media-player.ts index cfb17c91c5..ddf024ac98 100644 --- a/src/data/media-player.ts +++ b/src/data/media-player.ts @@ -12,6 +12,7 @@ export const SUPPORT_TURN_OFF = 256; export const SUPPORT_PLAY_MEDIA = 512; export const SUPPORT_VOLUME_BUTTONS = 1024; export const SUPPORT_SELECT_SOURCE = 2048; +export const SUPPORT_STOP = 4096; export const SUPPORTS_PLAY = 16384; export const SUPPORT_SELECT_SOUND_MODE = 65536; export const OFF_STATES = ["off", "idle"]; diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 5b2e32358e..d93791597b 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -25,12 +25,14 @@ import { SUPPORT_NEXT_TRACK, SUPPORTS_PLAY, fetchMediaPlayerThumbnailWithCache, + SUPPORT_STOP, } from "../../../data/media-player"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { HomeAssistant, MediaEntity } from "../../../types"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { fireEvent } from "../../../common/dom/fire_event"; import { MediaControlCardConfig } from "./types"; +import { UNAVAILABLE } from "../../../data/entity"; @customElement("hui-media-control-card") export class HuiMediaControlCard extends LitElement implements LovelaceCard { @@ -94,9 +96,8 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { style="background-image: url(${this.hass.hassUrl(picture)})" >
${this._config!.name || @@ -129,7 +130,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { ? "" : html` @@ -139,7 +140,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { ? "" : html`
From 9a7f7f119d21dc6181d95c718bc03012926dbd6b Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Mon, 17 Feb 2020 10:28:13 -0500 Subject: [PATCH 08/26] Review updates again because I am a fool --- src/panels/lovelace/cards/hui-media-control-card.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index d93791597b..54944b0a0a 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -86,9 +86,8 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { return html`
@@ -140,7 +139,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { ? "" : html`
From da1dd4516902db96d7b7b401093ebc5c9c48b3e2 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Mon, 17 Feb 2020 11:31:27 -0500 Subject: [PATCH 09/26] Update for playlist information if music isnt present --- src/panels/lovelace/cards/hui-media-control-card.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 54944b0a0a..c38940b375 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -238,6 +238,9 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { case "music": secondaryTitle = stateObj.attributes.media_artist; break; + case "playlist": + secondaryTitle = stateObj.attributes.media_playlist; + break; case "tvshow": secondaryTitle = stateObj.attributes.media_series_title; if (stateObj.attributes.media_season) { From be9ec50e3ad02839dfbd00e5aa1eb093ca005057 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Mon, 17 Feb 2020 11:51:05 -0500 Subject: [PATCH 10/26] When no image occurs mark the image as undefined --- src/panels/lovelace/cards/hui-media-control-card.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index c38940b375..bcc8e04b23 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -69,6 +69,8 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { } const stateObj = this.hass.states[this._config.entity] as MediaEntity; + console.log(stateObj); + if (!stateObj) { return html` Date: Mon, 17 Feb 2020 12:09:17 -0500 Subject: [PATCH 11/26] rookie mistake --- src/panels/lovelace/cards/hui-media-control-card.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index bcc8e04b23..c7dbe17f02 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -69,8 +69,6 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { } const stateObj = this.hass.states[this._config.entity] as MediaEntity; - console.log(stateObj); - if (!stateObj) { return html` Date: Mon, 17 Feb 2020 10:20:24 -0800 Subject: [PATCH 12/26] Add more info to system log (#4899) * Add more info to system log * Add util, oops * Tweak UI --- src/data/integration.ts | 10 ++++ src/data/system_log.ts | 6 +++ .../developer-tools/info/integrations-card.ts | 14 +++--- .../logs/dialog-system-log-detail.ts | 47 ++++++++++++++++++- .../developer-tools/logs/system-log-card.ts | 38 ++++++++------- src/panels/developer-tools/logs/util.ts | 13 +++++ 6 files changed, 102 insertions(+), 26 deletions(-) create mode 100644 src/data/integration.ts create mode 100644 src/panels/developer-tools/logs/util.ts diff --git a/src/data/integration.ts b/src/data/integration.ts new file mode 100644 index 0000000000..f322e96f10 --- /dev/null +++ b/src/data/integration.ts @@ -0,0 +1,10 @@ +import { LocalizeFunc } from "../common/translations/localize"; + +export const integrationDocsUrl = (domain: string) => + `https://www.home-assistant.io/integrations/${domain}`; + +export const integrationIssuesUrl = (domain: string) => + `https://github.com/home-assistant/home-assistant/issues?q=is%3Aissue+is%3Aopen+label%3A%22integration%3A+${domain}%22`; + +export const domainToName = (localize: LocalizeFunc, domain: string) => + localize(`domain.${domain}`) || domain; diff --git a/src/data/system_log.ts b/src/data/system_log.ts index 49f93b79ee..f780adffe3 100644 --- a/src/data/system_log.ts +++ b/src/data/system_log.ts @@ -1,6 +1,7 @@ import { HomeAssistant } from "../types"; export interface LoggedError { + name: string; message: string; level: string; source: string; @@ -14,3 +15,8 @@ export interface LoggedError { export const fetchSystemLog = (hass: HomeAssistant) => hass.callApi("GET", "error/all"); + +export const getLoggedErrorIntegration = (item: LoggedError) => + item.name.startsWith("homeassistant.components.") + ? item.name.split(".")[2] + : undefined; diff --git a/src/panels/developer-tools/info/integrations-card.ts b/src/panels/developer-tools/info/integrations-card.ts index e51f73366a..f16ad1e904 100644 --- a/src/panels/developer-tools/info/integrations-card.ts +++ b/src/panels/developer-tools/info/integrations-card.ts @@ -9,6 +9,10 @@ import { } from "lit-element"; import { HomeAssistant } from "../../../types"; import memoizeOne from "memoize-one"; +import { + integrationDocsUrl, + integrationIssuesUrl, +} from "../../../data/integration"; @customElement("integrations-card") class IntegrationsCard extends LitElement { @@ -28,18 +32,12 @@ class IntegrationsCard extends LitElement { ${domain} - + Documentation - + Issues diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts index e7a89162a9..11c075ae1d 100644 --- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts +++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts @@ -14,6 +14,13 @@ import { SystemLogDetailDialogParams } from "./show-dialog-system-log-detail"; import { PolymerChangedEvent } from "../../../polymer-types"; import { haStyleDialog } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; +import { + integrationDocsUrl, + integrationIssuesUrl, + domainToName, +} from "../../../data/integration"; +import { formatSystemLogTime } from "./util"; +import { getLoggedErrorIntegration } from "../../../data/system_log"; class DialogSystemLogDetail extends LitElement { @property() public hass!: HomeAssistant; @@ -30,6 +37,8 @@ class DialogSystemLogDetail extends LitElement { } const item = this._params.item; + const integration = getLoggedErrorIntegration(item); + return html` -

${new Date(item.timestamp * 1000)}

+

+ Logger: ${item.name} + ${integration + ? html` +
+ Integration: ${domainToName(this.hass.localize, integration)} + (documentation, + issues) + ` + : ""} +
+ ${item.count > 0 + ? html` + First occured: + ${formatSystemLogTime( + item.first_occured, + this.hass!.language + )} + (${item.count} occurences)
+ ` + : ""} + Last logged: + ${formatSystemLogTime(item.timestamp, this.hass!.language)} +

${item.message ? html` 
${item.message}
@@ -73,6 +109,15 @@ class DialogSystemLogDetail extends LitElement { ha-paper-dialog { direction: ltr; } + a { + color: var(--primary-color); + } + p { + margin-top: 0; + } + pre { + margin-bottom: 0; + } `, ]; } diff --git a/src/panels/developer-tools/logs/system-log-card.ts b/src/panels/developer-tools/logs/system-log-card.ts index 1a03a72e1c..cf619d5c45 100644 --- a/src/panels/developer-tools/logs/system-log-card.ts +++ b/src/panels/developer-tools/logs/system-log-card.ts @@ -15,20 +15,14 @@ import "../../../components/ha-card"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/buttons/ha-progress-button"; import { HomeAssistant } from "../../../types"; -import { LoggedError, fetchSystemLog } from "../../../data/system_log"; -import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time"; -import { formatTimeWithSeconds } from "../../../common/datetime/format_time"; +import { + LoggedError, + fetchSystemLog, + getLoggedErrorIntegration, +} from "../../../data/system_log"; import { showSystemLogDetailDialog } from "./show-dialog-system-log-detail"; - -const formatLogTime = (date, language: string) => { - const today = new Date().setHours(0, 0, 0, 0); - const dateTime = new Date(date * 1000); - const dateTimeDay = new Date(date * 1000).setHours(0, 0, 0, 0); - - return dateTimeDay < today - ? formatDateTimeWithSeconds(dateTime, language) - : formatTimeWithSeconds(dateTime, language); -}; +import { formatSystemLogTime } from "./util"; +import { domainToName } from "../../../data/integration"; @customElement("system-log-card") export class SystemLogCard extends LitElement { @@ -42,6 +36,9 @@ export class SystemLogCard extends LitElement { } protected render(): TemplateResult { + const integrations = this._items + ? this._items.map((item) => getLoggedErrorIntegration(item)) + : []; return html`
@@ -61,25 +58,32 @@ export class SystemLogCard extends LitElement {
` : this._items.map( - (item) => html` + (item, idx) => html`
${item.message}
- ${formatLogTime( + ${formatSystemLogTime( item.timestamp, this.hass!.language )} - ${item.source} (${item.level}) + – + ${integrations[idx] + ? domainToName( + this.hass!.localize, + integrations[idx]! + ) + : item.source} + (${item.level}) ${item.count > 1 ? html` - ${this.hass.localize( "ui.panel.developer-tools.tabs.logs.multiple_messages", "time", - formatLogTime( + formatSystemLogTime( item.first_occured, this.hass!.language ), diff --git a/src/panels/developer-tools/logs/util.ts b/src/panels/developer-tools/logs/util.ts new file mode 100644 index 0000000000..53912f5f91 --- /dev/null +++ b/src/panels/developer-tools/logs/util.ts @@ -0,0 +1,13 @@ +import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time"; + +import { formatTimeWithSeconds } from "../../../common/datetime/format_time"; + +export const formatSystemLogTime = (date, language: string) => { + const today = new Date().setHours(0, 0, 0, 0); + const dateTime = new Date(date * 1000); + const dateTimeDay = new Date(date * 1000).setHours(0, 0, 0, 0); + + return dateTimeDay < today + ? formatDateTimeWithSeconds(dateTime, language) + : formatTimeWithSeconds(dateTime, language); +}; From 1cc3936ec37716db1d405dedcc7bc5e959261a03 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Mon, 17 Feb 2020 13:36:21 -0500 Subject: [PATCH 13/26] Typing functions --- src/panels/lovelace/cards/hui-media-control-card.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index c7dbe17f02..6a319b4122 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -261,13 +261,13 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { return secondaryTitle; } - private _handleMoreInfo() { + private _handleMoreInfo(): void { fireEvent(this, "hass-more-info", { entityId: this._config!.entity, }); } - private _handleClick(e: MouseEvent) { + private _handleClick(e: MouseEvent): void { this.hass!.callService("media_player", (e.currentTarget! as any).action, { entity_id: this._config!.entity, }); From 2ab2ade6421cc374bcf56a6eb5e92ddd6fccda3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 17 Feb 2020 21:15:58 +0200 Subject: [PATCH 14/26] Import compare --- src/panels/developer-tools/event/events-list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/developer-tools/event/events-list.js b/src/panels/developer-tools/event/events-list.js index abf216b39a..b3f5e4e0c3 100644 --- a/src/panels/developer-tools/event/events-list.js +++ b/src/panels/developer-tools/event/events-list.js @@ -1,6 +1,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; +import { compare } from "../../../common/string/compare"; import { EventsMixin } from "../../../mixins/events-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; From 099430238c9a74e5a72a3f7eecbe9a20c0ed49ac Mon Sep 17 00:00:00 2001 From: HomeAssistant Azure Date: Tue, 18 Feb 2020 00:32:41 +0000 Subject: [PATCH 15/26] [ci skip] Translation update --- translations/cs.json | 10 +++++++++- translations/en.json | 9 ++++++++- translations/fr.json | 4 ++-- translations/ko.json | 6 +++--- translations/lb.json | 19 +++++++++++++------ translations/nb.json | 24 ++++++++++++------------ 6 files changed, 47 insertions(+), 25 deletions(-) diff --git a/translations/cs.json b/translations/cs.json index 862f2e8be5..1f646fa05b 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -604,7 +604,8 @@ "config_entry_system_options": { "enable_new_entities_description": "Pokud je zakázáno, nově objevené entity pro {integration} nebudou automaticky přidány do Home Assistant.", "enable_new_entities_label": "Povolit nově přidané entity.", - "title": "Systémové možnosti pro {integration}" + "title": "Systémové možnosti pro {integration}", + "update": "Aktualizovat" }, "confirmation": { "cancel": "Zrušit", @@ -640,6 +641,9 @@ "more_info_control": { "dismiss": "Zavřít dialog", "edit": "Upravit entitu", + "person": { + "create_zone": "Vytvořit zónu z aktuálního umístění" + }, "restored": { "confirm_remove_text": "Opravdu chcete tuto entitu odebrat?", "confirm_remove_title": "Odebrat entitu?", @@ -891,6 +895,7 @@ }, "edit_ui": "Upravit pomocí uživatelského rozhraní", "edit_yaml": "Upravit jako YAML", + "enable_disable": "Povolit / zakázat automatizaci", "introduction": "Použijte automatizace k oživení svého domova", "load_error_not_editable": "Lze upravovat pouze automatizace v automations.yaml.", "load_error_unknown": "Chyba při načítání automatizace ({err_no}).", @@ -1923,6 +1928,9 @@ "available_states": "Dostupné stavy", "name": "Ovládací panel alarmu" }, + "button": { + "name": "Tlačítko" + }, "conditional": { "name": "Podmínka" }, diff --git a/translations/en.json b/translations/en.json index 0fd6358577..bd41790c3d 100644 --- a/translations/en.json +++ b/translations/en.json @@ -581,6 +581,7 @@ "entity": "Related entities", "group": "Part of the following groups", "integration": "Integration", + "no_related_found": "No related items found.", "scene": "Part of the following scenes", "script": "Part of the following scripts" }, @@ -630,6 +631,7 @@ "unavailable": "This entity is not currently available.", "update": "UPDATE" }, + "no_unique_id": "This entity does not have a unique ID, therefore it's settings can not be managed from the UI.", "related": "Related", "settings": "Settings" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filter", "show_disabled": "Show disabled entities", + "show_readonly": "Show read-only entities", "show_unavailable": "Show unavailable entities" }, "header": "Entities", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Disabled", "ok": "Ok", + "readonly": "Read-only", "unavailable": "Unavailable" }, "unavailable": "(unavailable)" @@ -1701,7 +1705,10 @@ "required_error_msg": "This field is required", "update": "Update" }, - "edit_home_zone": "The location of your home can be changed in the general configuration.", + "edit_home_zone": "The radius of the Home zone can't be edited from the frontend yet. Drag the marker on the map to move the home zone.", + "edit_home_zone_narrow": "The radius of the Home zone can't be edited from the frontend yet. The location can be changed from the general configuration.", + "go_to_core_config": "Go to general configuration?", + "home_zone_core_config": "The location of your home zone is editable from the general configuration page. The radius of the Home zone can't be edited from the frontend yet. Do you want to go to the general configuration?", "introduction": "Zones allow you to specify certain regions on earth. When a person is within a zone, the state will take the name from the zone. Zones can also be used as a trigger or condition inside automation setups.", "no_zones_created_yet": "Looks like you have not created any zones yet." }, diff --git a/translations/fr.json b/translations/fr.json index 2a83688e88..51c1fd69bf 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1696,7 +1696,7 @@ "name": "Nom", "new_zone": "Nouvelle zone", "passive": "Passif", - "passive_note": "Les zones passives sont cachées dans le frontend et ne sont pas utilisées comme emplacement pour les traceurs de périphériques. C'est utile si vous voulez seulement les utiliser pour des automations.", + "passive_note": "Les zones passives sont cachées dans l'interface utilisateur et ne sont pas utilisées comme emplacement pour les appareils suivis. Elles sont utiles si vous voulez les utiliser pour des automations.", "radius": "Rayon", "required_error_msg": "Ce champ est requis", "update": "Mettre à jour" @@ -2381,7 +2381,7 @@ "push_notifications": { "description": "Envoyer des notifications à cet appareil.", "error_load_platform": "Configurer notify.html5.", - "error_use_https": "Nécessite l'activation SSL pour le frontend.", + "error_use_https": "Nécessite l'activation SSL pour l'interface utilisateur.", "header": "Notifications push", "link_promo": "En savoir plus", "push_notifications": "Notifications push" diff --git a/translations/ko.json b/translations/ko.json index 102689e56b..0838c59ba5 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -647,7 +647,7 @@ "restored": { "confirm_remove_text": "이 구성요소를 제거하시겠습니까?", "confirm_remove_title": "구성요소를 제거하시겠습니까?", - "not_provided": "이 구성요소는 현재 사용할 수 없으며 제거, 변경 또는 기능 장애가 있는 통합 구성요소이거나 기기의 남겨진 잔여데이터 입니다.", + "not_provided": "이 구성요소는 현재 사용할 수 없습니다. 기기의 남겨진 잔여 데이터 이거나 제거, 변경 또는 기능 장애가 있는 통합 구성요소일 수 있습니다.", "remove_action": "구성요소 제거", "remove_intro": "구성요소를 더 이상 사용하지 않는 경우, 이를 제거하여 정리할 수 있습니다." }, @@ -1218,11 +1218,11 @@ } }, "customize": { - "attributes_customize": "다음 속성은 이미 customize.yaml 에 설정되어 있습니다", + "attributes_customize": "customize.yaml 에 설정된 속성은 다음과 같습니다.", "attributes_not_set": "다음의 속성이 설정되지 않았습니다. 원하는 경우 설정해주세요.", "attributes_outside": "다음 속성은 customize.yaml 이 아닌 다른 곳에서 사용자화됩니다", "attributes_override": "원하는 경우 재정의 할 수 있습니다.", - "attributes_set": "구성요소의 다음 속성은 프로그래밍 방식으로 설정됩니다.", + "attributes_set": "프로그래밍되어 자동으로 설정된 속성은 다음과 같습니다.", "caption": "사용자화", "description": "구성요소를 사용자화 합니다", "different_include": "도메인, 글로브 혹은 다른 포함 구성을 통해 가능할 수 있습니다.", diff --git a/translations/lb.json b/translations/lb.json index f16abd0b64..1c9de75892 100644 --- a/translations/lb.json +++ b/translations/lb.json @@ -602,9 +602,9 @@ }, "dialogs": { "config_entry_system_options": { - "enable_new_entities_description": "Falls desaktivéiert, ginn nei entdeckten Entitéiten net automatesch zu Home Assistant dobäigesat.", + "enable_new_entities_description": "Falls desaktivéiert, ginn nei entdeckten Entitéiten fir {integration} net automatesch zu Home Assistant dobäigesat.", "enable_new_entities_label": "Aktivéiert nei dobäigesate Entitéiten.", - "title": "System Optiounen", + "title": "System Optiounen fir {integration}", "update": "Aktualiséieren" }, "confirmation": { @@ -641,6 +641,9 @@ "more_info_control": { "dismiss": "Dialog ofbriechen", "edit": "Entitéit änneren", + "person": { + "create_zone": "Zone erstellen vun der aktueller Positioun" + }, "restored": { "confirm_remove_text": "Sécher fir dës Entitéit ze läsche?", "confirm_remove_title": "Entitéit läschen?", @@ -892,6 +895,7 @@ }, "edit_ui": "Mam Benotzer Inteface änneren", "edit_yaml": "Als YAML änneren", + "enable_disable": "Automatismen aktivéieren/deaktivieren", "introduction": "Benotzt Automatismen fir däin Haus zum Liewen ze bréngen", "load_error_not_editable": "Nëmmen Automatiounen am automations.yaml kënnen editéiert ginn.", "load_error_unknown": "Feeler beim luede vun der Automatioun ({err_no}).", @@ -1266,7 +1270,7 @@ "details": "Hei sinn all Detailer vun ärem Apparat.", "device_not_found": "Apparat net fonnt.", "entities": { - "add_entities_lovelace": "All Entitéiten zu Lovelace bäisetzen", + "add_entities_lovelace": "Zu Lovelace bäisetzen", "entities": "Entitéiten", "none": "Dësen Appart huet keng Entitéiten." }, @@ -1507,7 +1511,7 @@ "section": { "reloading": { "automation": "Automatisme nei lueden", - "core": "Kär néi lueden", + "core": "Standuert and Personnalisatioun néi lueden", "group": "Gruppe nei lueden", "heading": "Konfiguratioun gëtt frësch gelueden", "introduction": "E puer Deeler vum Home Assistant kënne frësch geluede ginn ouni datt een Neistart néideg ass. Klick op nei luede fir di aktuell Konfiguratioun z'entlueden an di nei Konfiguratioun ze lueden.", @@ -1692,7 +1696,7 @@ "name": "Numm", "new_zone": "Nei Zon", "passive": "Passiv", - "passive_note": "Passiv Zonë sinn am Frontend verstoppt a ginn net als Standuert fir Apparaten Tracker benotzt. Dëst ass nëtzlech wann Dir et just fir Automatisme wëllt benotzen.", + "passive_note": "Passiv Zone sinn am Frontend verstoppt a ginn net als Standuert fir Apparaten Tracker benotzt. Dëst ass nëtzlech wann Dir et just fir Automatisme wëllt benotzen.", "radius": "Radius", "required_error_msg": "Dëst Feld ass erfuerderlech", "update": "Aktualiséieren" @@ -1924,6 +1928,9 @@ "available_states": "Verfügbar Zoustänn", "name": "Alarm Zentral" }, + "button": { + "name": "Knäppchen" + }, "conditional": { "name": "Bedingungen" }, @@ -2101,7 +2108,7 @@ }, "suggest_card": { "add": "Zu Lovelace bäisetzen", - "create_own": "Erstellt är eegen", + "create_own": "Aner Kaart auswielen", "header": "Mir hun eng Suggestioun fir iech erstallt" }, "view": { diff --git a/translations/nb.json b/translations/nb.json index 304a56fc0e..140f0a897a 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -1010,7 +1010,7 @@ "cloud": { "account": { "alexa": { - "config_documentation": "Konfigurer dokumentasjon", + "config_documentation": "Konfigurasjonsdokumentasjon", "disable": "deaktiver", "enable": "aktiver", "enable_ha_skill": "Aktivere Home Assistant-ferdigheten for Alexa", @@ -1027,7 +1027,7 @@ "connection_status": "Status for skytilkobling", "fetching_subscription": "Henter abonnement...", "google": { - "config_documentation": "Konfigurer dokumentasjon", + "config_documentation": "Konfigurasjonsdokumentasjon", "devices_pin": "PIN-kode for sikkerhetsenheter", "enable_ha_skill": "Aktivere Home Assistant-ferdigheten for Google Assistant", "enable_state_reporting": "Aktiver tilstandsrapportering", @@ -1376,7 +1376,7 @@ "add_area": "Legg til område", "area_picker_label": "Område", "close": "Lukk", - "created_config": "Opprettet konfigurasjon for {name}.", + "created_config": "Opprettet konfigurasjon for {name} .", "dismiss": "Avvis dialog", "error_saving_area": "Feil ved lagring av område: {error}", "external_step": { @@ -1729,12 +1729,12 @@ "network_stopped": "Z-Wave nettverket stoppet" }, "node_config": { - "config_parameter": "Konfigurasjon parameter", - "config_value": "Konfigurasjon verdi", + "config_parameter": "Konfigurasjonsparameter", + "config_value": "Konfigurasjonsverdi", "false": "Usant", "header": "Alternativer for nodekonfigurasjon", "seconds": "sekunder", - "set_config_parameter": "Angi konfigurasjons parameter", + "set_config_parameter": "Angi konfigurasjonsparameter", "set_wakeup": "Angi vekkeintervall", "true": "Sant" }, @@ -2077,20 +2077,20 @@ "header": "Rediger brukergrensesnitt", "menu": { "open": "Åpne Lovelace UI-menyen", - "raw_editor": "Tekstbasert konfigurasjonsredigering" + "raw_editor": "Redigeringsprogram for raw-konfigurasjon" }, "migrate": { "header": "Inkompatibel Konfigurasjon", - "migrate": "Overfør konfigurasjon", - "para_migrate": "Home Assistant kan legge til ID-er på alle dine kort og visninger automatisk for deg ved å trykke på 'Overfør konfigurasjon' knappen.", + "migrate": "Migrer konfigurasjon", + "para_migrate": "Hjemmeassistent kan legge til ID-er på alle kortene og visningene automatisk for deg ved å trykke på 'Migrer konfigurasjon' -knappen.", "para_no_id": "Dette elementet har ingen ID. Vennligst legg til en ID på dette elementet i 'ui-lovelace.yaml'." }, "raw_editor": { "confirm_remove_config_text": "Vi vil automatisk generere Lovelace-visningene dine med områdene og enhetene dine hvis du fjerner Lovelace-konfigurasjonen.", "confirm_remove_config_title": "Er du sikker på at du vil fjerne Lovelace-konfigurasjonen? Vi vil automatisk generere Lovelace-visningene dine med områdene og enhetene dine.", "confirm_unsaved_changes": "Du har ulagrede endringer, er du sikker på at du vil avslutte?", - "confirm_unsaved_comments": "Konfigurasjonen din inneholder kommentar(er), disse vil ikke bli lagret. Vil du fortsette?", - "error_invalid_config": "Konfigurasjonen er ikke gyldig: {error}", + "confirm_unsaved_comments": "Konfigurasjonen din inneholder kommentarer, disse vil ikke bli lagret. Vil du fortsette?", + "error_invalid_config": "Konfigurasjonen din er ikke gyldig: {error}", "error_parse_yaml": "Kan ikke analysere YAML: {error}", "error_remove": "Kan ikke fjerne konfigurasjonen: {error}", "error_save_yaml": "Kan ikke lagre YAML: {error}", @@ -2216,7 +2216,7 @@ "data": { "password": "API-passord" }, - "description": "Vennligst skriv inn API-passordet i http-konfigurasjonen din:" + "description": "Skriv inn API-passordet i HTTP-konfigurasjonen:" }, "mfa": { "data": { From 52ae01ea7487ad19b24edd6abb160735a520d8f0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 18 Feb 2020 11:27:27 +0100 Subject: [PATCH 16/26] Fix description and title of options flow (#4910) --- src/dialogs/config-flow/show-dialog-options-flow.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialogs/config-flow/show-dialog-options-flow.ts b/src/dialogs/config-flow/show-dialog-options-flow.ts index 3e1b6d1742..493b1d2b77 100644 --- a/src/dialogs/config-flow/show-dialog-options-flow.ts +++ b/src/dialogs/config-flow/show-dialog-options-flow.ts @@ -47,7 +47,7 @@ export const showOptionsFlowDialog = ( renderShowFormStepHeader(hass, step) { return ( hass.localize( - `component.${step.handler}.options.step.${step.step_id}.title` + `component.${configEntry.domain}.options.step.${step.step_id}.title` ) || hass.localize(`ui.dialogs.options_flow.form.header`) ); }, @@ -55,7 +55,7 @@ export const showOptionsFlowDialog = ( renderShowFormStepDescription(hass, step) { const description = localizeKey( hass.localize, - `component.${step.handler}.config.step.${step.step_id}.description`, + `component.${configEntry.domain}.options.step.${step.step_id}.description`, step.description_placeholders ); return description From 4675579f79b00c140e17602e59834dc69d438708 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 18 Feb 2020 08:33:25 -0800 Subject: [PATCH 17/26] Add safe mode support (#4908) * Add safe mode support * Lint * Fix type in demo --- package.json | 2 +- src/fake_data/demo_config.ts | 1 + .../areas/dialog-area-registry-detail.ts | 1 + .../lovelace/cards/hui-safe-mode-card.ts | 70 +++++++++++++++++++ .../common/generate-lovelace-config.ts | 16 +++-- .../create-element/create-card-element.ts | 2 + src/panels/lovelace/hui-root.ts | 3 +- src/translations/en.json | 5 ++ yarn.lock | 8 +-- 9 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 src/panels/lovelace/cards/hui-safe-mode-card.ts diff --git a/package.json b/package.json index 8336c0692c..09facfc322 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "fuse.js": "^3.4.4", "google-timezones-json": "^1.0.2", "hls.js": "^0.12.4", - "home-assistant-js-websocket": "^4.4.0", + "home-assistant-js-websocket": "4.4.1", "intl-messageformat": "^2.2.0", "js-yaml": "^3.13.1", "leaflet": "^1.4.0", diff --git a/src/fake_data/demo_config.ts b/src/fake_data/demo_config.ts index 1361937db4..91e7080771 100644 --- a/src/fake_data/demo_config.ts +++ b/src/fake_data/demo_config.ts @@ -17,4 +17,5 @@ export const demoConfig: HassConfig = { version: "DEMO", whitelist_external_dirs: [], config_source: "storage", + safe_mode: false, }; diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 520d676195..093f099766 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -6,6 +6,7 @@ import { TemplateResult, property, } from "lit-element"; +import "@material/mwc-button"; import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable"; import "@polymer/paper-input/paper-input"; diff --git a/src/panels/lovelace/cards/hui-safe-mode-card.ts b/src/panels/lovelace/cards/hui-safe-mode-card.ts new file mode 100644 index 0000000000..01f579d3f8 --- /dev/null +++ b/src/panels/lovelace/cards/hui-safe-mode-card.ts @@ -0,0 +1,70 @@ +import { + html, + LitElement, + TemplateResult, + customElement, + css, + CSSResult, + property, +} from "lit-element"; +import "@material/mwc-button"; + +import "../../../components/ha-card"; + +import { LovelaceCard } from "../types"; +import { HomeAssistant } from "../../../types"; + +@customElement("hui-safe-mode-card") +export class HuiSafeModeCard extends LitElement implements LovelaceCard { + @property() public hass?: HomeAssistant; + + public getCardSize(): number { + return 3; + } + + public setConfig(_config: any): void { + // No config necessary. + } + + protected render(): TemplateResult { + return html` + +
+ ${this.hass!.localize( + "ui.panel.lovelace.cards.safe-mode.description" + )} +
+
+ + + ${this.hass!.localize( + "ui.panel.lovelace.cards.safe-mode.show_errors" + )} + + +
+ + `; + } + + static get styles(): CSSResult { + return css` + ha-card { + --ha-card-header-color: var(--primary-color); + } + .card-actions a { + text-decoration: none; + } + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-safe-mode-card": HuiSafeModeCard; + } +} diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts index ae5c5dff95..8f450fcdea 100644 --- a/src/panels/lovelace/common/generate-lovelace-config.ts +++ b/src/panels/lovelace/common/generate-lovelace-config.ts @@ -404,6 +404,17 @@ export const generateLovelaceConfigFromData = async ( entities: HassEntities, localize: LocalizeFunc ): Promise => { + if (config.safe_mode) { + return { + title: config.location_name, + views: [ + { + cards: [{ type: "safe-mode" }], + }, + ], + }; + } + const viewEntities = extractViews(entities); const views = viewEntities.map((viewEntity: GroupEntity) => { @@ -461,11 +472,8 @@ export const generateLovelaceConfigFromData = async ( // User has no entities if (views.length === 1 && views[0].cards!.length === 0) { - import( - /* webpackChunkName: "hui-empty-state-card" */ "../cards/hui-empty-state-card" - ); views[0].cards!.push({ - type: "custom:hui-empty-state-card", + type: "empty-state", }); } diff --git a/src/panels/lovelace/create-element/create-card-element.ts b/src/panels/lovelace/create-element/create-card-element.ts index 74f171580f..d3acc76267 100644 --- a/src/panels/lovelace/create-element/create-card-element.ts +++ b/src/panels/lovelace/create-element/create-card-element.ts @@ -31,11 +31,13 @@ const ALWAYS_LOADED_TYPES = new Set([ const LAZY_LOAD_TYPES = { "alarm-panel": () => import("../cards/hui-alarm-panel-card"), + "empty-state": () => import("../cards/hui-empty-state-card"), "entity-filter": () => import("../cards/hui-entity-filter-card"), "picture-elements": () => import("../cards/hui-picture-elements-card"), "picture-entity": () => import("../cards/hui-picture-entity-card"), "picture-glance": () => import("../cards/hui-picture-glance-card"), "plant-status": () => import("../cards/hui-plant-status-card"), + "safe-mode": () => import("../cards/hui-safe-mode-card"), "shopping-list": () => import("../cards/hui-shopping-list-card"), conditional: () => import("../cards/hui-conditional-card"), gauge: () => import("../cards/hui-gauge-card"), diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts index 33f3191644..abedfe33f0 100644 --- a/src/panels/lovelace/hui-root.ts +++ b/src/panels/lovelace/hui-root.ts @@ -226,7 +226,8 @@ class HUIRoot extends LitElement { ` : ""} - ${this.hass!.user!.is_admin + ${this.hass!.user!.is_admin && + !this.hass!.config.safe_mode ? html` Date: Tue, 18 Feb 2020 22:17:52 +0100 Subject: [PATCH 18/26] Fix multiselect without data (#4906) --- src/components/ha-form/ha-form-multi_select.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts index 2f21740a14..dc85f3f6cc 100644 --- a/src/components/ha-form/ha-form-multi_select.ts +++ b/src/components/ha-form/ha-form-multi_select.ts @@ -41,6 +41,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { ? this.schema.options : Object.entries(this.schema.options!); + const data = this.data || []; return html`
@@ -49,7 +50,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { id="input" type="text" readonly - value=${this.data + value=${data .map((value) => this.schema.options![value] || value) .join(", ")} label=${this.label} @@ -68,7 +69,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { multi slot="dropdown-content" attr-for-selected="item-value" - .selectedValues=${this.data} + .selectedValues=${data} @selected-items-changed=${this._valueChanged} @iron-select=${this._onSelect} > @@ -79,7 +80,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { return html` ${this._optionLabel(item)} From 0a41a4f066f301e6d18a7dc4b12dacde13c77184 Mon Sep 17 00:00:00 2001 From: HomeAssistant Azure Date: Wed, 19 Feb 2020 00:32:35 +0000 Subject: [PATCH 19/26] [ci skip] Translation update --- translations/ca.json | 7 ++ translations/en.json | 5 + translations/es.json | 9 +- translations/fr.json | 5 + translations/it.json | 233 ++++++++++++++++++++------------------ translations/ja.json | 96 +++++++++++++++- translations/ko.json | 4 +- translations/nl.json | 9 +- translations/pl.json | 7 ++ translations/ru.json | 6 + translations/sl.json | 17 ++- translations/sv.json | 14 +++ translations/vi.json | 1 + translations/zh-Hant.json | 13 ++- 14 files changed, 301 insertions(+), 125 deletions(-) diff --git a/translations/ca.json b/translations/ca.json index 0bbc7cdf2d..f8c935b556 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -581,6 +581,7 @@ "entity": "Entitats relacionades", "group": "Part dels següents grups", "integration": "Integració", + "no_related_found": "No s'han trobat elements relacionats.", "scene": "Part de les següents escenes", "script": "Part dels següents programes (scripts)" }, @@ -630,6 +631,7 @@ "unavailable": "Aquesta entitat no està disponible actualment.", "update": "ACTUALITZA" }, + "no_unique_id": "Aquesta entitat no té un ID únic, per tant, no pot ser configurada des de la interfície d'usuari.", "related": "Relacionades", "settings": "Configuració" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filtre", "show_disabled": "Mostra entitats desactivades", + "show_readonly": "Mostra entitats de només lectura", "show_unavailable": "Mostra entitats no disponibles" }, "header": "Registre d'entitats", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Desactivada/es", "ok": "D'acord", + "readonly": "Només lectura", "unavailable": "No disponible/s" }, "unavailable": "(no disponible)" @@ -1702,6 +1706,9 @@ "update": "Actualitza" }, "edit_home_zone": "La ubicació de casa es pot canviar des de la configuració general.", + "edit_home_zone_narrow": "El radi de la zona principal (casa) encara no es pot editar des del \"frontend\". Sí que pots canviar-ne la ubicació des de la configuració general.", + "go_to_core_config": "Anar a la configuració general?", + "home_zone_core_config": "La ubicació de la zona principal (casa) és pot canviar des de la pàgina de configuració general. El radi d'aquesta zona encara no es pot editar des d'aquí. Vols anar a la configuració general?", "introduction": "Les zones et permeten definir certes regions del planeta. Quan una persona es trobi dins d’una zona, l’estat prendrà el nom d'aquesta zona. També es poden utilitzar com a disparadors o condicions durant la creació d'automatitzacions.", "no_zones_created_yet": "Sembla que encara no has creat cap zona." }, diff --git a/translations/en.json b/translations/en.json index bd41790c3d..1a09f9519f 100644 --- a/translations/en.json +++ b/translations/en.json @@ -1916,6 +1916,11 @@ "toggle": "Toggle {name}", "url": "Open window to {url_path}" }, + "safe-mode": { + "description": "Home Assistant ran into trouble while loading your configuration and is now running in safe mode. Take a look at the error log to see what went wrong.", + "header": "Safe Mode Activated", + "show_errors": "Show errors" + }, "shopping-list": { "add_item": "Add item", "checked_items": "Checked items", diff --git a/translations/es.json b/translations/es.json index 9244228cb1..6b18bb436c 100644 --- a/translations/es.json +++ b/translations/es.json @@ -581,6 +581,7 @@ "entity": "Entidades relacionadas", "group": "Parte de los siguientes grupos", "integration": "Integración", + "no_related_found": "No se encontraron elementos relacionados.", "scene": "Parte de las siguientes escenas", "script": "Parte de los siguientes scripts" }, @@ -630,6 +631,7 @@ "unavailable": "Esta entidad no está disponible actualmente.", "update": "ACTUALIZAR" }, + "no_unique_id": "Esta entidad no tiene una ID única, por lo que su configuración no se puede administrar desde la IU.", "related": "Relacionado", "settings": "Configuración" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filtrar", "show_disabled": "Mostrar entidades deshabilitadas", + "show_readonly": "Mostrar entidades de solo lectura", "show_unavailable": "Mostrar entidades no disponibles" }, "header": "Entidades", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Deshabilitado", "ok": "De acuerdo", + "readonly": "Solo lectura", "unavailable": "No disponible" }, "unavailable": "(no disponible)" @@ -1701,7 +1705,10 @@ "required_error_msg": "Este campo es obligatorio", "update": "Actualizar" }, - "edit_home_zone": "La ubicación de tu casa se puede cambiar en la configuración general.", + "edit_home_zone": "El radio de la zona de tu casa aún no se puede editar desde la interfaz. Arrastra el marcador en el mapa para mover la zona de tu casa.", + "edit_home_zone_narrow": "El radio de la zona de tu casa aún no se puede editar desde la interfaz. La ubicación se puede cambiar desde la configuración general.", + "go_to_core_config": "¿Ir a la configuración general?", + "home_zone_core_config": "La ubicación de la zona de tu casa se puede editar desde la página de configuración general. El radio de la zona de tu casa aún no se puede editar desde la interfaz. ¿Quieres ir a la configuración general?", "introduction": "Las zonas permiten especificar determinadas regiones de la tierra. Cuando una persona está dentro de una zona, su estado tomará el nombre de la zona. Las zonas también se pueden utilizar como desencadenante o condición dentro de las configuraciones de automatización.", "no_zones_created_yet": "Parece que aún no has creado ninguna zona." }, diff --git a/translations/fr.json b/translations/fr.json index 51c1fd69bf..6fcdd5df9f 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -581,6 +581,7 @@ "entity": "Entités liées", "group": "Partie des groupes suivants", "integration": "Intégration", + "no_related_found": "Aucun historique des valeurs trouvé.", "scene": "Partie des scènes suivantes", "script": "Partie des scripts suivants" }, @@ -630,6 +631,7 @@ "unavailable": "Cette entité n'est pas disponible actuellement.", "update": "MISE À JOUR" }, + "no_unique_id": "Cette entité n'a pas d'identifiant unique, ses paramètres ne peuvent donc pas être gérés à partir de l'interface utilisateur.", "related": "Liées", "settings": "Réglages" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filtre", "show_disabled": "Afficher les entités désactivées", + "show_readonly": "Afficher les entités désactivées", "show_unavailable": "Afficher les entités non disponibles" }, "header": "Entités", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Désactivé", "ok": "Ok", + "readonly": "Lecture seule", "unavailable": "Indisponible" }, "unavailable": "(indisponible)" @@ -1702,6 +1706,7 @@ "update": "Mettre à jour" }, "edit_home_zone": "L'emplacement de votre maison peut être modifié dans la configuration générale.", + "go_to_core_config": "Configuration générale", "introduction": "Les zones vous permettent de spécifier certaines régions sur la terre. Lorsqu'une personne se trouve dans une zone, l'état prend le nom de la zone. Les zones peuvent également être utilisées comme déclencheur ou condition dans les configurations d'automation.", "no_zones_created_yet": "Il semble que vous n'ayez pas encore créé de zones." }, diff --git a/translations/it.json b/translations/it.json index c6102e88c9..a0e2b3bb65 100644 --- a/translations/it.json +++ b/translations/it.json @@ -29,7 +29,7 @@ "hassio": "Hass.io", "history_graph": "Grafico cronologico", "homeassistant": "Home Assistant", - "image_processing": "Elaborazione delle immagini", + "image_processing": "Elaborazione immagini", "input_boolean": "Input booleano", "input_datetime": "Input di data", "input_number": "Input numerico", @@ -66,7 +66,7 @@ "calendar": "Calendario", "config": "Impostazioni", "dev-info": "Informazioni", - "developer_tools": "Strumenti per Sviluppatori", + "developer_tools": "Strumenti per sviluppatori", "history": "Storico", "logbook": "Registro", "mailbox": "Posta", @@ -92,7 +92,7 @@ }, "preset_mode": { "activity": "Attività", - "away": "Fuori Casa", + "away": "Fuori casa", "boost": "Boost", "comfort": "Comfort", "eco": "Eco", @@ -112,35 +112,35 @@ "arming": "Attivando", "disarmed": "Disattivo", "disarming": "Disattivando", - "pending": "Attende", + "pending": "Sospeso", "triggered": "Attiv." }, "default": { "entity_not_found": "Entità non trovata!", "error": "Errore", - "unavailable": "Non Disp.", + "unavailable": "Non disp.", "unknown": "Ignoto" }, "device_tracker": { "home": "In Casa", - "not_home": "Fuori" + "not_home": "Fuori casa" }, "person": { - "home": "A Casa", - "not_home": "Fuori Casa" + "home": "A casa", + "not_home": "Fuori casa" } }, "state": { "alarm_control_panel": { "armed": "Attivo", - "armed_away": "Attivo Fuori Casa", + "armed_away": "Attivo fuori casa", "armed_custom_bypass": "Attivo con bypass", "armed_home": "Attivo in casa", "armed_night": "Attivo Notte", - "arming": "In Blocco", + "arming": "In attivazione", "disarmed": "Disattivo", - "disarming": "In Sblocco", - "pending": "In attesa", + "disarming": "In disattivazione", + "pending": "In sospeso", "triggered": "Attivato" }, "automation": { @@ -201,7 +201,7 @@ "on": "Aperta" }, "presence": { - "off": "Fuori", + "off": "Fuori casa", "on": "A casa" }, "problem": { @@ -275,7 +275,7 @@ }, "device_tracker": { "home": "A casa", - "not_home": "Fuori" + "not_home": "Fuori casa" }, "fan": { "off": "Spento", @@ -286,7 +286,7 @@ "closing": "Chiusura", "home": "A casa", "locked": "Bloccato", - "not_home": "Fuori", + "not_home": "Fuori casa", "off": "Spento", "ok": "OK", "on": "Acceso", @@ -313,12 +313,12 @@ "off": "Spento", "on": "Acceso", "paused": "In pausa", - "playing": "In Riproduzione", + "playing": "In riproduzione", "standby": "Pausa" }, "person": { "home": "A casa", - "not_home": "Fuori Casa" + "not_home": "Fuori casa" }, "plant": { "ok": "OK", @@ -348,9 +348,9 @@ "on": "Acceso" }, "timer": { - "active": "Attivo", - "idle": "Inattivo", - "paused": "In pausa" + "active": "attivo", + "idle": "inattivo", + "paused": "in pausa" }, "vacuum": { "cleaning": "Pulendo", @@ -360,7 +360,7 @@ "off": "Spento", "on": "Acceso", "paused": "In pausa", - "returning": "Ritornando alla base" + "returning": "Ritorno alla base" }, "weather": { "clear-night": "Sereno, notte", @@ -368,8 +368,8 @@ "exceptional": "Eccezionale", "fog": "Nebbia", "hail": "Grandine", - "lightning": "Temporali", - "lightning-rainy": "Temporali, piovoso", + "lightning": "Temporale", + "lightning-rainy": "Temporale, piovoso", "partlycloudy": "Parzialmente nuvoloso", "pouring": "Piogge intense", "rainy": "Piovoso", @@ -384,26 +384,26 @@ "dead": "Disattivo", "initializing": "Avvio", "ready": "Pronto", - "sleeping": "In Attesa" + "sleeping": "In attesa" }, "query_stage": { "dead": "Disattivo ({query_stage})", - "initializing": "Avvio ( {query_stage} )" + "initializing": "Avvio ({query_stage})" } } }, "ui": { "auth_store": { - "ask": "Salvare questo account di accesso?", + "ask": "Salvare questo login?", "confirm": "Salva login", "decline": "No grazie" }, "card": { "alarm_control_panel": { - "arm_away": "Attiva Fuori Casa", + "arm_away": "Attiva fuori casa", "arm_custom_bypass": "Bypass personalizzato", - "arm_home": "Attiva In Casa", - "arm_night": "Attiva Notte", + "arm_home": "Attiva in casa", + "arm_night": "Attiva notte", "armed_custom_bypass": "Attiva con bypass", "clear_code": "Canc", "code": "Codice", @@ -418,7 +418,7 @@ }, "climate": { "aux_heat": "Riscaldamento ausiliario", - "away_mode": "Modalità Assente", + "away_mode": "Modalità assente", "cooling": "{name} raffreddamento", "current_temperature": "{name} temperatura attuale", "currently": "Attualmente", @@ -426,20 +426,20 @@ "heating": "{name} riscaldamento", "high": "alto", "low": "basso", - "on_off": "Acceso / Spento", + "on_off": "Acceso / spento", "operation": "Operazione", "preset_mode": "Preset", "swing_mode": "Modo oscillazione", "target_humidity": "Umidità desiderata", "target_temperature": "Temperatura desiderata", - "target_temperature_entity": "{name} temperatura target", - "target_temperature_mode": "{name} temperatura target {mode}" + "target_temperature_entity": "{name} temperatura desiderata", + "target_temperature_mode": "{name} temperatura desiderata {mode}" }, "counter": { "actions": { - "decrement": "diminuzione", - "increment": "aumento", - "reset": "Ripristina" + "decrement": "diminuisci", + "increment": "aumenta", + "reset": "ripristina" } }, "cover": { @@ -465,7 +465,7 @@ "unlock": "Sbloccato" }, "media_player": { - "sound_mode": "Modalità Audio", + "sound_mode": "Modalità audio", "source": "Fonte", "text_to_speak": "Testo da leggere" }, @@ -484,24 +484,24 @@ "timer": { "actions": { "cancel": "annulla", - "finish": "finire", + "finish": "termina", "pause": "pausa", - "start": "avvio" + "start": "avvia" } }, "vacuum": { "actions": { - "resume_cleaning": "Riprendere la pulizia", - "return_to_base": "Ritornare alla base", - "start_cleaning": "Iniziare la pulizia", - "turn_off": "Spegnere", - "turn_on": "Accendere" + "resume_cleaning": "Riprendi pulizia", + "return_to_base": "Ritorna alla base", + "start_cleaning": "Inizia pulizia", + "turn_off": "Spegni", + "turn_on": "Accendi" } }, "water_heater": { "away_mode": "Modalità fuori casa", "currently": "Attualmente", - "on_off": "Acceso / Spento", + "on_off": "Acceso / spento", "operation": "Operazione", "target_temperature": "Temperatura da raggiungere" }, @@ -536,7 +536,7 @@ }, "common": { "cancel": "Annulla", - "close": "Chiudere", + "close": "Chiudi", "loading": "Caricamento", "no": "No", "save": "Salva", @@ -552,7 +552,7 @@ "text": "Inserisci il nome della nuova area.", "title": "Aggiungi nuova area" }, - "add_new": "Aggiungi nuova area ...", + "add_new": "Aggiungi nuova area…", "area": "Area", "clear": "Cancella", "show_areas": "Mostra le aree" @@ -561,7 +561,7 @@ "clear": "Cancella", "device": "Dispositivo", "show_devices": "Mostra dispositivi", - "toggle": "Attivare/Disattivare" + "toggle": "Azionare" }, "entity": { "entity-picker": { @@ -571,8 +571,8 @@ } }, "history_charts": { - "loading_history": "Caricamento storico", - "no_history_found": "Nessuno storico trovato" + "loading_history": "Caricamento storico...", + "no_history_found": "Nessuno storico trovato." }, "related-items": { "area": "Area", @@ -581,8 +581,9 @@ "entity": "Entità correlate", "group": "Parte dei seguenti gruppi", "integration": "Integrazione", + "no_related_found": "Non sono stati trovati oggetti correlati.", "scene": "Parte delle seguenti scene", - "script": "Parte dei seguenti scripts" + "script": "Parte dei seguenti script" }, "relative_time": { "duration": { @@ -624,12 +625,13 @@ "enabled_cause": "Disabilitato da {cause}.", "enabled_description": "Le entità disabilitate non saranno aggiunte a Home Assistant", "enabled_label": "Abilita entità", - "entity_id": "ID Entità", + "entity_id": "ID entità", "name": "Sostituzione nome", "note": "Nota: questo potrebbe non funzionare ancora con tutte le integrazioni.", "unavailable": "Questa entità non è attualmente disponibile.", "update": "AGGIORNA" }, + "no_unique_id": "Questa entità non ha un ID univoco, pertanto le impostazioni non possono essere gestite dall'Interfaccia Utente.", "related": "Relazionato", "settings": "Impostazioni" }, @@ -710,7 +712,7 @@ }, "last_seen": "Ultima visualizzazione", "manuf": "da {manufacturer}", - "no_area": "Nessuna Area", + "no_area": "Nessuna area", "power_source": "Sorgente di alimentazione", "quirk": "Quirk", "services": { @@ -736,7 +738,7 @@ "login-form": { "log_in": "Accedi", "password": "Password", - "remember": "Ricorda" + "remember": "Ricordami" }, "notification_drawer": { "click_to_configure": "Fare clic sul pulsante per configurare {entity}", @@ -745,7 +747,7 @@ "title": "Notifiche" }, "notification_toast": { - "connection_lost": "Connessione persa. Riconnessione...", + "connection_lost": "Connessione persa. Riconnessione…", "entity_turned_off": "Spenta {entity}.", "entity_turned_on": "Accesa {entity}.", "service_call_failed": "Fallita chiamata a servizio {service} .", @@ -764,7 +766,7 @@ "description": "Panoramica di tutte le aree della tua casa.", "editor": { "create": "CREA", - "default_name": "Nuova Area", + "default_name": "Nuova area", "delete": "ELIMINA", "update": "AGGIORNA" }, @@ -780,18 +782,18 @@ }, "automation": { "caption": "Automazioni", - "description": "Crea e modifica Automazioni", + "description": "Crea e modifica automazioni", "editor": { "actions": { - "add": "Aggiungi Azione", + "add": "Aggiungi azione", "delete": "Elimina", "delete_confirm": "Sicuro di voler eliminare?", "duplicate": "Duplica", "header": "Azioni", - "introduction": "Le Azioni sono ciò che Home Assistant eseguirà quando una Attivazione (o Trigger) avvia una Automazione.", - "learn_more": "Per saperne di più sulle Azioni", + "introduction": "Le azioni sono ciò che Home Assistant eseguirà quando un'attivazione (o trigger) avvia un'automazione.", + "learn_more": "Per saperne di più sulle azioni", "name": "Azione", - "type_select": "Tipo di Azione", + "type_select": "Tipo di azione", "type": { "condition": { "label": "Condizione" @@ -809,14 +811,14 @@ "event": { "event": "Evento:", "label": "Attiva Evento", - "service_data": "Dati del Servizio" + "service_data": "Dati del servizio" }, "scene": { "label": "Attivare la scena" }, "service": { - "label": "Chiama Servizio", - "service_data": "Dati del Servizio" + "label": "Chiama servizio", + "service_data": "Dati del servizio" }, "wait_template": { "label": "Attendere", @@ -828,13 +830,13 @@ }, "alias": "Nome", "conditions": { - "add": "Aggiungi Condizione", + "add": "Aggiungi condizione", "delete": "Elimina", "delete_confirm": "Sicuro di voler eliminare?", "duplicate": "Duplica", "header": "Condizioni", - "introduction": "Le Condizioni sono facoltative e impediranno un'ulteriore esecuzione se non saranno soddisfatte tutte.", - "learn_more": "Per saperne di più sulle Condizioni", + "introduction": "Le condizioni sono facoltative e impediranno un'ulteriore esecuzione se non saranno soddisfatte tutte.", + "learn_more": "Per saperne di più sulle condizioni", "name": "Condizione", "type_select": "Tipo di Condizione", "type": { @@ -901,15 +903,15 @@ "load_error_unknown": "Errore durante il caricamento dell'Automazione ({err_no}).", "save": "Salva", "triggers": { - "add": "Aggiungi Attivazione (o Trigger)", + "add": "Aggiungi Attivazione", "delete": "Elimina", "delete_confirm": "Sicuro di voler eliminare?", "duplicate": "Duplica", "header": "Attivazioni (o Triggers)", - "introduction": "L'Attivazione (o Trigger) avvia l'elaborazione di una regola di automazione. È possibile specificare più Attivazioni (o Triggers) per una stessa regola di automazione. Una volta avviata una Attivazione (o Trigger), Home Assistant convaliderà la/e Condizione/i, se presente/i, ed eseguirà l'Azione.", + "introduction": "L'Attivazione (o Trigger) avvia l'elaborazione di una regola di automazione. È possibile specificare più Attivazioni per una stessa regola di automazione. Una volta avviata una Attivazione, Home Assistant convaliderà le Condizioni, se presenti, ed eseguirà l'Azione.", "learn_more": "Per saperne di più sulle Attivazioni (o Triggers)", - "name": "Attivazione (o Trigger)", - "type_select": "Tipo di Attivazione (o Trigger)", + "name": "Attivazione", + "type_select": "Tipo di Attivazione", "type": { "device": { "extra_fields": { @@ -995,16 +997,16 @@ }, "picker": { "add_automation": "Aggiungi Automazione", - "delete_automation": "Cancellare l'Automazione", - "delete_confirm": "Sei sicuro di voler eliminare questa Automazione?", - "edit_automation": "Modifica Automazione", + "delete_automation": "Cancellare l'automazione", + "delete_confirm": "Sei sicuro di voler eliminare questa automazione?", + "edit_automation": "Modifica automazione", "header": "Editor di Automazione", "introduction": "L'Editor di Automazione consente di creare e modificare Automazioni. Seguire il collegamento seguente per leggere le istruzioni e assicurarsi di aver configurato correttamente Home Assistant.", "learn_more": "Per saperne di più sulle Automazioni", "no_automations": "Nessuna Automazione modificabile trovata", - "only_editable": "Solo le Automazioni definite in automations.yaml sono modificabili.", + "only_editable": "Solo le automazioni definite in automations.yaml sono modificabili.", "pick_automation": "Scegli l'Automazione da modificare", - "show_info_automation": "Mostra informazioni sull'Automazione" + "show_info_automation": "Mostra informazioni sull'automazione" } }, "cloud": { @@ -1177,7 +1179,7 @@ "edit_requires_storage": "Editor disabilitato perché la configurazione è memorizzata in configuration.yaml.", "elevation": "Altitudine", "elevation_feet": "piedi", - "elevation_meters": "Metri", + "elevation_meters": "metri", "imperial_example": "Fahrenheit, libbre", "latitude": "Latitudine", "location_name": "Nome della tua installazione di Home Assistant", @@ -1189,28 +1191,28 @@ "unit_system_imperial": "Imperiale", "unit_system_metric": "Metrico" }, - "header": "Configurazione e controllo del Server", + "header": "Configurazione e controllo del server", "introduction": "Cambiare la configurazione può essere un processo faticoso. Lo sappiamo. Questa sezione cercherà di semplificarti la vita." }, "server_control": { "reloading": { - "automation": "Ricarica le Automazioni", - "core": "Ricarica il Nucleo", - "group": "Ricarica i Gruppi", + "automation": "Ricarica automazioni", + "core": "Ricarica core", + "group": "Ricarica gruppi", "heading": "Aggiornamento della Configurazione", "introduction": "Alcune parti di Home Assistant possono essere aggiornate senza richiedere un riavvio. Premendo su Ricarica si rimuoverà la loro configurazione attuale e si caricherà la versione aggiornata.", - "script": "Ricarica gli Script" + "script": "Ricarica script" }, "server_management": { - "heading": "Gestione del Server", + "heading": "Gestione del server", "introduction": "Controlla il tuo Server Home Assistant... da Home Assistant.", "restart": "Riavviare", "stop": "Arrestare" }, "validation": { - "check_config": "Controlla la Configurazione", - "heading": "Convalida della Configurazione", - "introduction": "Convalidare la Configurazione se di recente sono state apportate alcune modifiche alla stessa e si desidera assicurarsi che sia tutto valido", + "check_config": "Controlla configurazione", + "heading": "Convalida configurazione", + "introduction": "Convalidare la configurazione se di recente sono state apportate alcune modifiche alla stessa e si desidera assicurarsi che sia tutto valido", "invalid": "Configurazione non valida", "valid": "Configurazione valida!" } @@ -1247,8 +1249,8 @@ "conditions": { "caption": "Fai qualcosa solo se..." }, - "create": "Crea l'Automazione con il dispositivo", - "no_automations": "Nessuna Automazione", + "create": "Crea l'automazione con il dispositivo", + "no_automations": "Nessuna automazione", "no_device_automations": "Non ci sono Automazioni disponibili per questo dispositivo.", "triggers": { "caption": "Fai qualcosa quando..." @@ -1283,8 +1285,8 @@ }, "scenes": "Scene", "script": { - "create": "Crea uno Script con il dispositivo", - "no_scripts": "Nessuno Script", + "create": "Crea uno script con il dispositivo", + "no_scripts": "Nessuno script", "scripts": "Script" }, "scripts": "Script", @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filtro", "show_disabled": "Mostra entità disabilitate", + "show_readonly": "Mostra entità di sola lettura", "show_unavailable": "Mostra entità non disponibili" }, "header": "Entità", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Disabilitato", "ok": "Ok", + "readonly": "Sola lettura", "unavailable": "Non disponibile" }, "unavailable": "(non disponibile)" @@ -1471,7 +1475,7 @@ "delete_confirm": "Sei sicuro di voler cancellare questa scena?", "delete_scene": "Cancella scena", "edit_scene": "Modifica scena", - "header": "Editor di Scene", + "header": "Editor di scene", "introduction": "L'Editor di Scene ti consente di creare e modificare Scene. Seguire il collegamento seguente per leggere le istruzioni e assicurarsi di aver configurato correttamente Home Assistant.", "learn_more": "Ulteriori informazioni sulle scene", "no_scenes": "Impossibile trovare scene modificabili", @@ -1485,7 +1489,7 @@ "description": "Crea e modifica Script", "editor": { "alias": "Nome", - "default_name": "Nuovo Script", + "default_name": "Nuovo script", "delete_confirm": "Sei sicuro di voler eliminare questo script?", "delete_script": "Elimina script", "header": "Script: {name}", @@ -1498,15 +1502,15 @@ "picker": { "add_script": "Aggiungi script", "edit_script": "Modifica script", - "header": "Editor di Script", + "header": "Editor script", "introduction": "L'Editor di Script consente di creare e modificare Script. Seguire il collegamento seguente per leggere le istruzioni e assicurarsi di aver configurato correttamente Home Assistant.", "learn_more": "Ulteriori informazioni sugli script", "no_scripts": "Non è stato possibile trovare alcuno script modificabile", - "trigger_script": "Attiva Script" + "trigger_script": "Attiva script" } }, "server_control": { - "caption": "Controlli del Server", + "caption": "Controlli del server", "description": "Riavviare e arrestare il server Home Assistant", "section": { "reloading": { @@ -1601,9 +1605,9 @@ "issue_zigbee_command": "Emettere il comando Zigbee" }, "clusters": { - "header": "Clusters", + "header": "Cluster", "help_cluster_dropdown": "Selezionare un cluster per visualizzare attributi e comandi.", - "introduction": "I Clusters sono gli elementi costitutivi della funzionalità Zigbee. Essi separano la funzionalità in unità logiche. Esistono tipi di client e di server che sono costituiti da attributi e comandi." + "introduction": "I cluster sono gli elementi costitutivi della funzionalità Zigbee. Essi separano la funzionalità in unità logiche. Esistono tipi di client e di server che sono costituiti da attributi e comandi." }, "common": { "add_devices": "Aggiungi dispositivi", @@ -1623,14 +1627,14 @@ }, "group_binding": { "bind_button_help": "Collega il gruppo selezionato all'insieme dei dispositivi selezionati.", - "bind_button_label": "Collega Gruppo", + "bind_button_label": "Collega gruppo", "cluster_selection_help": "Seleziona i cluster da associare al gruppo selezionato.", "group_picker_help": "Seleziona un gruppo per emettere un comando.", "group_picker_label": "Gruppi collegabili", "header": "Collegamento gruppo", "introduction": "Collega e scollega gruppi", "unbind_button_help": "Scollega il gruppo selezionato dall'insieme dei dispositivi selezionati.", - "unbind_button_label": "Scollega Gruppo" + "unbind_button_label": "Scollega gruppo" }, "groups": { "add_members": "Aggiungi membri", @@ -1638,7 +1642,7 @@ "caption": "Gruppi", "create": "Crea gruppo", "create_group": "Zigbee Home Automation - Crea gruppo", - "create_group_details": "Immettere i dettagli richiesti per creare un nuovo gruppo zigbee", + "create_group_details": "Immettere i dettagli richiesti per creare un nuovo gruppo Zigbee", "creating_group": "Creazione di un gruppo", "description": "Crea e modifica gruppi Zigbee", "group_details": "Qui ci sono tutti i dettagli per il gruppo Zigbee selezionato.", @@ -1660,7 +1664,7 @@ "zha_zigbee_groups": "Gruppi ZHA Zigbee" }, "header": "Configura Zigbee Home Automation", - "introduction": "Qui è possibile configurare il componente ZHA. Non tutto è ancora possibile configurare dall'IU, ma ci stiamo lavorando.", + "introduction": "Qui è possibile configurare il componente ZHA. Non tutto è ancora possibile configurare dall'interfaccia utente, ma ci stiamo lavorando.", "network_management": { "header": "Gestione della rete", "introduction": "Comandi che influiscono sull'intera rete" @@ -1701,7 +1705,10 @@ "required_error_msg": "Questo campo è obbligatorio", "update": "Aggiorna" }, - "edit_home_zone": "La posizione della tua casa può essere cambiata nella configurazione generale.", + "edit_home_zone": "Il raggio della zona di casa non può ancora essere modificato dal frontend. Trascina l'indicatore sulla mappa per spostare la zona di casa.", + "edit_home_zone_narrow": "Il raggio della zona Casa non può ancora essere modificato dal frontend. La posizione può essere modificata dalla configurazione generale.", + "go_to_core_config": "Passare alla configurazione generale?", + "home_zone_core_config": "La posizione della zona Casa è modificabile dalla pagina di configurazione generale. Il raggio della zona iniziale non può ancora essere modificato dal frontend. Vuoi andare alla configurazione generale?", "introduction": "Le Zone consentono di specificare determinate regioni sulla Terra. Quando una persona si trova all'interno di una Zona, nel suo Stato ci sarà il nome dalla Zona. Le Zone possono anche essere utilizzate come Attivazioni (o Triggers) o Condizioni all'interno delle impostazioni di Automazione.", "no_zones_created_yet": "Sembra che tu non abbia ancora creato nessuna zona." }, @@ -1855,9 +1862,9 @@ "description1": "Impostare la rappresentazione di un dispositivo all'interno di Home Assistant.", "description2": "Questo non comunicherà con il dispositivo attuale.", "entity": "Entità", - "filter_attributes": "Attributi del filtro", + "filter_attributes": "Filtra attributi", "filter_entities": "Filtra entità", - "filter_states": "Stati del filtro", + "filter_states": "Filtra stati", "more_info": "Ulteriori informazioni", "no_entities": "Nessuna entità", "set_state": "Imposta Stato", @@ -1871,7 +1878,7 @@ "jinja_documentation": "Documentazione del modello Jinja2", "template_extensions": "Estensioni del modello Home Assistant", "title": "Modelli", - "unknown_error_template": "Errore sconosciuto nel modello di rendering" + "unknown_error_template": "Errore sconosciuto nel rendering del modello" } } }, @@ -1886,9 +1893,9 @@ }, "lovelace": { "add_entities": { - "generated_unsupported": "Questa funzione può essere utilizzata solo dopo aver preso il controllo dell'Interfaccia Utente di Lovelace.", - "saving_failed": "Salvataggio della configurazione dell'Interfaccia Utente di Lovelace non riuscito.", - "yaml_unsupported": "Non è possibile utilizzare questa funzione quando si utilizza l'Interfaccia Utente di Lovelace in modalità YAML." + "generated_unsupported": "Questa funzione può essere utilizzata solo dopo aver preso il controllo dell'interfaccia utente di Lovelace.", + "saving_failed": "Salvataggio della configurazione dell'interfaccia utente di Lovelace non riuscito.", + "yaml_unsupported": "Non è possibile utilizzare questa funzione quando si utilizza l'interfaccia utente di Lovelace in modalità YAML." }, "cards": { "confirm_delete": "Sei sicuro di voler cancellare questa scheda?", @@ -2052,7 +2059,7 @@ "edit": "Modifica", "header": "Configurazione della scheda", "move": "Sposta nella vista", - "options": "Più opzioni", + "options": "Altre opzioni", "pick_card": "Quale scheda vorresti aggiungere?", "pick_card_view_title": "Quale scheda vorresti aggiungere alla tua vista {name}?", "save": "Salva", @@ -2076,7 +2083,7 @@ }, "header": "Modifica dell'interfaccia utente", "menu": { - "open": "Apri il menu dell'Interfaccia Utente di Lovelace", + "open": "Apri il menu dell'interfaccia utente di Lovelace", "raw_editor": "Editor di Configurazione testuale" }, "migrate": { @@ -2086,8 +2093,8 @@ "para_no_id": "Questo elemento non ha un ID. Aggiungi un ID a questo elemento in 'ui-lovelace.yaml'." }, "raw_editor": { - "confirm_remove_config_text": "Genereremo automaticamente le tue viste dell'Interfaccia Utente di Lovelace con le tue Aree e Dispositivi se rimuovi la tua configurazione dell'Interfaccia Utente di Lovelace.", - "confirm_remove_config_title": "Sei sicuro di voler rimuovere la tua configurazione dell'Interfaccia Utente di Lovelace? Genereremo automaticamente le tue viste Lovelace con le tue Aree e Dispositivi.", + "confirm_remove_config_text": "Genereremo automaticamente le tue viste dell'Interfaccia utente di Lovelace con le tue aree e dispositivi se rimuovi la tua configurazione dell'interfaccia utente di Lovelace.", + "confirm_remove_config_title": "Sei sicuro di voler rimuovere la tua configurazione dell'interfaccia utente di Lovelace? Genereremo automaticamente le tue viste Lovelace con le tue aree e dispositivi.", "confirm_unsaved_changes": "Hai delle modifiche non salvate, sei sicuro di voler uscire?", "confirm_unsaved_comments": "La tua configurazione contiene commenti, questi non verranno salvati. Vuoi continuare?", "error_invalid_config": "La tua configurazione non è valida: {error}", @@ -2107,7 +2114,7 @@ "save": "Prendere il controllo" }, "suggest_card": { - "add": "Aggiungi all'Interfaccia Utente di Lovelace", + "add": "Aggiungi all'interfaccia utente di Lovelace", "create_own": "Scegliere una scheda diversa", "header": "Abbiamo creato un suggerimento per te" }, diff --git a/translations/ja.json b/translations/ja.json index 69eecfac3d..21217b5861 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -370,10 +370,24 @@ "yes": "はい" }, "components": { + "area-picker": { + "add_dialog": { + "add": "追加", + "failed_create_area": "エリアを作成できませんでした。", + "name": "名前", + "text": "新しいエリアの名前を入力してください。", + "title": "新しいエリアを追加" + }, + "add_new": "新しいエリアを追加…", + "area": "エリア", + "clear": "消去", + "show_areas": "エリアを表示" + }, "device-picker": { "clear": "削除", "device": "デバイス", - "show_devices": "デバイスを表示" + "show_devices": "デバイスを表示", + "toggle": "切り替え" }, "entity": { "entity-picker": { @@ -386,6 +400,9 @@ "loading_history": "状態履歴を読込中...", "no_history_found": "状態履歴がありません。" }, + "related-items": { + "no_related_found": "関連するアイテムが見つかりませんでした。" + }, "relative_time": { "duration": { "hour": "{count} {count, plural,\n one {時間}\n other {時間}\n}" @@ -400,7 +417,8 @@ "dialogs": { "config_entry_system_options": { "enable_new_entities_description": "無効にするには、 {integration} から検出された新しいエンティティは Home Assistant に自動的に追加されません。", - "title": "{integration} のシステムオプション" + "title": "{integration} のシステムオプション", + "update": "更新" }, "confirmation": { "cancel": "キャンセル", @@ -410,14 +428,42 @@ "domain_toggler": { "title": "ドメインを切り替え" }, + "entity_registry": { + "editor": { + "delete": "削除", + "enabled_cause": "{cause} によって無効にされました。", + "enabled_label": "エンティティを有効化", + "update": "更新" + } + }, + "generic": { + "cancel": "キャンセル", + "default_confirmation_title": "本当ですか？", + "ok": "OK" + }, "more_info_control": { "dismiss": "ダイアログを閉じる", "edit": "エンティティを編集", + "person": { + "create_zone": "現在地からゾーンを作成" + }, "settings": "エンティティ設定", "sun": { "elevation": "高度", "rising": "日の出ます", "setting": "日の入っています" + }, + "vacuum": { + "clean_spot": "クリーンスポット", + "commands": "掃除機コマンド：", + "fan_speed": "ファン回転速度", + "locate": "見つける", + "pause": "一時停止", + "return_home": "ホームに戻戻る", + "start": "開始", + "start_pause": "開始/一時停止", + "status": "状態", + "stop": "停止" } }, "more_info_settings": { @@ -552,6 +598,7 @@ "default_name": "新しいオートメーション", "edit_ui": "UI で編集", "edit_yaml": "YAML で編集", + "enable_disable": "オートメーションの有効化/無効化", "introduction": "オートメーションを使用して、あなたの家を生き生きとさせましょう。", "save": "保存", "triggers": { @@ -714,6 +761,11 @@ }, "devices": { "area_picker_label": "エリア", + "automation": { + "automations": "オートメーション", + "no_automations": "オートメーションなし", + "no_device_automations": "このデバイスで利用可能なオートメーションはありません。" + }, "automations": "オートメーション", "confirm_rename_entity_ids": "エンティティの ID も変更しますか？", "data_table": { @@ -728,17 +780,36 @@ "details": "これらはデバイスの詳細な情報です。", "device_not_found": "デバイスが見つかりません。", "info": "デバイス情報", + "name": "名前", + "scene": { + "no_scenes": "シーンなし", + "scenes": "シーン" + }, + "scenes": "シーン", + "script": { + "create": "デバイスからスクリプトを作成", + "no_scripts": "スクリプトなし", + "scripts": "スクリプト" + }, + "scripts": "スクリプト", "unknown_error": "不明なエラー", - "unnamed_device": "名前のないデバイス" + "unnamed_device": "名前のないデバイス", + "update": "更新" }, "entities": { "caption": "エンティティ", "description": "すべて既知のエンティティの一覧", "picker": { + "filter": { + "show_readonly": "読み取り専用のエンティティを表示" + }, "header": "エンティティ", "headers": { "entity_id": "エンティティ ID", "name": "名前" + }, + "status": { + "readonly": "読み取り専用" } } }, @@ -836,8 +907,10 @@ "group": "グループの再読込", "heading": "設定の再読込", "introduction": "Home Assistant の一部は、再起動を必要とせずに再読込できます。再読込を押すと、現在の設定をアンロードし、新しい設定を読み込みます。", + "person": "人の再読込", "scene": "シーンの再読込", - "script": "スクリプトの再読込" + "script": "スクリプトの再読込", + "zone": "ゾーンの再読込" }, "server_management": { "confirm_restart": "Home Assistant を再起動してもよろしいですか？", @@ -890,6 +963,17 @@ "header": "デバイス管理" } }, + "zone": { + "detail": { + "icon": "アイコン", + "latitude": "緯度", + "longitude": "経度", + "name": "名前", + "new_zone": "新しいゾーン", + "radius": "半径" + }, + "go_to_core_config": "一般的な構成に移動しますか？" + }, "zwave": { "caption": "Z-Wave", "common": { @@ -1001,6 +1085,9 @@ }, "editor": { "card": { + "button": { + "name": "ボタン" + }, "conditional": { "name": "条件付き" }, @@ -1204,6 +1291,7 @@ }, "profile": { "advanced_mode": { + "link_promo": "もっと見る", "title": "高度モード" }, "change_password": { diff --git a/translations/ko.json b/translations/ko.json index 0838c59ba5..63da61b68b 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -2051,7 +2051,7 @@ "delete": "카드 삭제", "edit": "편집", "header": "카드 구성", - "move": "보기로 이동", + "move": "다른 뷰로 이동", "options": "옵션 더보기", "pick_card": "어떤 카드를 추가하시겠습니까?", "pick_card_view_title": "{name} 뷰에 어떤 카드를 추가하시겠습니까?", @@ -2108,7 +2108,7 @@ }, "suggest_card": { "add": "Lovelace UI 에 추가", - "create_own": "다른 카드를 선택해주세요", + "create_own": "다른 카드 선택", "header": "제안 드리는 카드" }, "view": { diff --git a/translations/nl.json b/translations/nl.json index 6368353608..c966c8dd2f 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -581,6 +581,7 @@ "entity": "Gerelateerde entiteiten", "group": "Onderdeel van de volgende groepen", "integration": "Integratie", + "no_related_found": "Geen gerelateerde items gevonden.", "scene": "Onderdeel van de volgende scènes", "script": "Onderdeel van de volgende scripts" }, @@ -630,6 +631,7 @@ "unavailable": "Deze entiteit is momenteel niet beschikbaar.", "update": "BIJWERKEN" }, + "no_unique_id": "Deze entiteit heeft geen unieke ID, daarom kunnen de instellingen niet worden beheerd vanuit de gebruikersinterface.", "related": "Gerelateerd", "settings": "instellingen" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "filter", "show_disabled": "Uitgeschakelde entiteiten weergeven", + "show_readonly": "Alleen-lezen entiteiten weergeven", "show_unavailable": "Onbeschikbare entiteiten weergeven" }, "header": "Entiteiten", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Uitgeschakeld", "ok": "OK", + "readonly": "Alleen-lezen", "unavailable": "Onbeschikbaar" }, "unavailable": "(niet beschikbaar)" @@ -1701,7 +1705,10 @@ "required_error_msg": "Dit veld is verplicht", "update": "Bijwerken" }, - "edit_home_zone": "De locatie van je huis kan worden gewijzigd bij de algemene instellingen.", + "edit_home_zone": "De straal van de thuiszone kan nog niet vanaf de frontend worden bewerkt. Sleep de markering op de kaart om de thuiszone te verplaatsen.", + "edit_home_zone_narrow": "De straal van de thuiszone kan nog niet vanaf de frontend worden bewerkt. De locatie kan worden gewijzigd vanuit de algemene instellingen.", + "go_to_core_config": "Ga naar de algemene instellingen?", + "home_zone_core_config": "De locatie van uw thuiszone kan worden bewerkt vanuit de algemene instellingen-pagina. De straal van de thuiszone kan nog niet vanaf de frontend worden bewerkt. Wilt u naar de algemene instellingen gaan?", "introduction": "Met zones kunt u bepaalde regio's op aarde opgeven. Wanneer een persoon zich in een zone bevindt, dan wordt de staat de naam uit de zone. Zones kunnen ook worden gebruikt als trigger of voorwaarde in automatiseringen.", "no_zones_created_yet": "Het lijkt erop dat je nog geen zones hebt aangemaakt." }, diff --git a/translations/pl.json b/translations/pl.json index b72707c08f..7ed20d4333 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -581,6 +581,7 @@ "entity": "Powiązane encje", "group": "Element następujących grup", "integration": "Integracja", + "no_related_found": "Nie znaleziono powiązanych elementów.", "scene": "Element następujących scen", "script": "Element następujących skryptów" }, @@ -630,6 +631,7 @@ "unavailable": "Ta encja nie jest obecnie dostępna.", "update": "AKTUALIZUJ" }, + "no_unique_id": "Ten encja nie ma unikalnego identyfikatora, dlatego jego ustawieniami nie można zarządzać z interfejsu użytkownika.", "related": "Powiązane", "settings": "Ustawienia" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "Filtr", "show_disabled": "Wyświetlaj wyłączone encje", + "show_readonly": "Pokaż encje tylko do odczytu", "show_unavailable": "Wyświetlaj niedostępne encje" }, "header": "Rejestr encji", @@ -1346,6 +1349,7 @@ "status": { "disabled": "Wyłączone", "ok": "Ok", + "readonly": "Tylko do odczytu", "unavailable": "Niedostępne" }, "unavailable": "(niedostępne)" @@ -1702,6 +1706,9 @@ "update": "Aktualizuj" }, "edit_home_zone": "Lokalizację domu można zmienić w konfiguracji ogólnej.", + "edit_home_zone_narrow": "Promienia strefy domowej nie można jeszcze edytować z poziomu interfejsu użytkownika. Lokalizację można zmienić z ogólnej konfiguracji.", + "go_to_core_config": "Czy chcesz przejść do konfiguracji ogólnej?", + "home_zone_core_config": "Lokalizację strefy domowej można edytować na stronie konfiguracji ogólnej. Promienia strefy domowej nie można jeszcze edytować z poziomu interfejsu użytkownika. Czy chcesz przejść do ogólnej konfiguracji?", "introduction": "Strefy pozwalają określić regiony na ziemi. Gdy dana osoba znajduje się w strefie, jej encja pobierze stan z nazwy strefy. Strefy mogą być również używane jako wyzwalacz lub warunek w automatyzacjach.", "no_zones_created_yet": "Wygląda na to, że nie utworzyłeś jeszcze żadnych stref." }, diff --git a/translations/ru.json b/translations/ru.json index 5163b93721..b4f8ff55db 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -630,6 +630,7 @@ "unavailable": "Этот объект в настоящее время недоступен.", "update": "ОБНОВИТЬ" }, + "no_unique_id": "У этого объекта нет уникального идентификатора, поэтому его настройками нельзя управлять из пользовательского интерфейса.", "related": "Зависимости", "settings": "Настройки" }, @@ -1323,6 +1324,7 @@ "filter": { "filter": "Фильтр", "show_disabled": "Показывать отключенные объекты", + "show_readonly": "Показать объекты, доступные только для чтения", "show_unavailable": "Показывать недоступные объекты" }, "header": "Объекты", @@ -1346,6 +1348,7 @@ "status": { "disabled": "Отключено", "ok": "Ok", + "readonly": "Только для чтения", "unavailable": "Недоступно" }, "unavailable": "(недоступен)" @@ -1695,6 +1698,9 @@ "update": "Обновить" }, "edit_home_zone": "Местоположение Вашего дома может быть изменено в разделе настроек \"Общие\".", + "edit_home_zone_narrow": "Местоположение домашней зоны может быть изменено в разделе настроек \"Общие\". Радиус домашней зоны изменить в пользовательском интерфейсе в настоящее время невозможно.", + "go_to_core_config": "Перейти в раздел \"Общие\"?", + "home_zone_core_config": "Местоположение домашней зоны может быть изменено в разделе настроек \"Общие\". Радиус домашней зоны изменить в пользовательском интерфейсе в настоящее время невозможно. Перейти в раздел настроек \"Общие\"?", "introduction": "Зоны позволяют указывать определенные области на земле. Когда отслеживаемая персона находится в назначенной зоне, её состоянием будет название зоны. Зоны также могут использоваться в качестве триггера или условия в автоматизациях.", "no_zones_created_yet": "У Вас еще нет добавленных зон." }, diff --git a/translations/sl.json b/translations/sl.json index 6a7944c954..ba10422a7f 100644 --- a/translations/sl.json +++ b/translations/sl.json @@ -581,6 +581,7 @@ "entity": "Sorodne entitete", "group": "Del naslednjih skupin", "integration": "Integracija", + "no_related_found": "Najden ni bil noben povezan element.", "scene": "Del naslednjih prizorov", "script": "Del naslednjih skript" }, @@ -604,7 +605,8 @@ "config_entry_system_options": { "enable_new_entities_description": "Če je onemogočeno, novo odkrite entitete za {integration} ne bodo samodejno dodane v Home Assistant.", "enable_new_entities_label": "Omogočite novo dodane subjekte.", - "title": "Sistemske možnosti za {integration}" + "title": "Sistemske možnosti za {integration}", + "update": "Posodobite" }, "confirmation": { "cancel": "Prekliči", @@ -629,6 +631,7 @@ "unavailable": "Ta entiteta trenutno ni na voljo.", "update": "POSODOBITEV" }, + "no_unique_id": "Ta entiteta nima enoličnega ID-ja, zato nastavitev ni mogoče upravljati iz uporabniškega vmesnika.", "related": "Povezano", "settings": "Nastavitve" }, @@ -640,6 +643,9 @@ "more_info_control": { "dismiss": "Opusti pogovorno okno", "edit": "Uredi entiteto", + "person": { + "create_zone": "Ustvari območje iz trenutne lokacije" + }, "restored": { "confirm_remove_text": "Ali ste prepričani, da želite odstraniti to entiteto?", "confirm_remove_title": "Ali želite odstraniti entiteto?", @@ -891,6 +897,7 @@ }, "edit_ui": "Uredi z uporabniškim vmesnikom", "edit_yaml": "Uredi z YAML-om", + "enable_disable": "Omogoči / onemogoči avtomatizacijo", "introduction": "Uporabite avtomatizacije za oživitev vašega doma.", "load_error_not_editable": "Urejati je mogoče le avtomatizacije v automations.yaml.", "load_error_unknown": "Napaka pri nalaganju avtomatizacije ({err_no}).", @@ -1318,6 +1325,7 @@ "filter": { "filter": "Filter", "show_disabled": "Pokaži onemogočene subjekte", + "show_readonly": "Prikaži entitete \"samo za branje\"", "show_unavailable": "Pokaži nerazpoložljive entitete" }, "header": "Entitete", @@ -1341,6 +1349,7 @@ "status": { "disabled": "Onemogočeno", "ok": "V redu", + "readonly": "Samo za branje", "unavailable": "Ni na voljo" }, "unavailable": "(ni na voljo)" @@ -1697,6 +1706,9 @@ "update": "Posodobite" }, "edit_home_zone": "Lokacijo vašega doma lahko spremenite v splošni konfiguraciji.", + "edit_home_zone_narrow": "Polmera domačega območja še ni mogoče urejati iz frontend-a. Lokacijo lahko spremenite iz splošne konfiguracije.", + "go_to_core_config": "Pojdi na splošno konfiguracijo?", + "home_zone_core_config": "Lokacijo domačega območja je mogoče urejati na strani splošne konfiguracije. Polmera domačega območja še ni mogoče urejati iz frontend-a. Ali želite iti na splošno konfiguracijo?", "introduction": "Območja omogočajo določitev določenih regij. Ko je oseba znotraj tega območja, bo stanje prevzelo njegovo ime. Območja se lahko uporabljajo tudi kot sprožilec ali pogoj v avtomatizacijah.", "no_zones_created_yet": "Izgleda, da še niste ustvarili nobenih con." }, @@ -1923,6 +1935,9 @@ "available_states": "Stanja na voljo", "name": "Alarmna plošča" }, + "button": { + "name": "Gumb" + }, "conditional": { "name": "Pogojno" }, diff --git a/translations/sv.json b/translations/sv.json index dc501ebdbf..1224c6182a 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -581,6 +581,7 @@ "entity": "Relaterade entiteter", "group": "Del av följande grupper", "integration": "Integration", + "no_related_found": "Inga relaterade objekt hittades.", "scene": "Del av följande scenarier", "script": "Del av följande skript" }, @@ -630,6 +631,7 @@ "unavailable": "Den här entiteten är för närvarande inte tillgänglig.", "update": "UPPDATERA" }, + "no_unique_id": "Den här entiteten har inget unikt ID, därför kan det inte hanteras från användargränssnittet.", "related": "Relaterade", "settings": "Inställningar" }, @@ -641,6 +643,9 @@ "more_info_control": { "dismiss": "Avfärda", "edit": "Redigera entitet", + "person": { + "create_zone": "Skapa zon från aktuell plats" + }, "restored": { "confirm_remove_text": "Är du säker på att du vill ta bort den här entiteten?", "confirm_remove_title": "Ta bort entitet?", @@ -892,6 +897,7 @@ }, "edit_ui": "Redigera med UI", "edit_yaml": "Redigera som YAML", + "enable_disable": "Aktivera/inaktivera automatisering", "introduction": "Använd automatiseringar för väcka liv i ditt hem", "load_error_not_editable": "Endast automatiseringar i automations.yaml kan redigeras.", "load_error_unknown": "Fel vid inläsning av automatisering ({err_no}).", @@ -1319,6 +1325,7 @@ "filter": { "filter": "Filter", "show_disabled": "Visa inaktiverade entiteter", + "show_readonly": "Visa skrivskyddade entiteter", "show_unavailable": "Visa otillgängliga entiteter" }, "header": "Entiteter", @@ -1342,6 +1349,7 @@ "status": { "disabled": "Inaktiverad", "ok": "Ok", + "readonly": "Skrivskyddad", "unavailable": "Inte tillgänglig" }, "unavailable": "(ej tillgänglig)" @@ -1698,6 +1706,9 @@ "update": "Uppdatera" }, "edit_home_zone": "Platsen för ditt hem kan ändras i den allmänna konfigurationen.", + "edit_home_zone_narrow": "Radien i hemzonen kan inte redigeras från frontend ännu. Platsen kan ändras från den allmänna konfigurationen.", + "go_to_core_config": "Gå till allmän konfiguration?", + "home_zone_core_config": "Platsen för din hemzon kan redigeras från den allmänna konfigurationssidan. Radien i hemzonen kan inte redigeras från frontend ännu. Vill du gå till den allmänna konfigurationen?", "introduction": "Med zoner kan du ange vissa regioner på jorden. När en person befinner sig i en zon tar tillståndet namnet från zonen. Zoner kan också användas som utlösare eller villkor i automatiseringsinställningar.", "no_zones_created_yet": "Det verkar som om du inte har skapat några zoner ännu." }, @@ -1924,6 +1935,9 @@ "available_states": "Tillgängliga tillstånd", "name": "Larmpanel" }, + "button": { + "name": "Knapp" + }, "conditional": { "name": "Villkorlig" }, diff --git a/translations/vi.json b/translations/vi.json index c53b2de154..77f0d55dae 100644 --- a/translations/vi.json +++ b/translations/vi.json @@ -1040,6 +1040,7 @@ "edit": "Chỉnh sửa", "header": "Cấu hình Thẻ", "move": "Di chuyển", + "options": "Tùy Chọn", "pick_card": "Chọn Thẻ bạn muốn thêm.", "save": "Lưu", "toggle_editor": "Đổi trình biên tập" diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json index 108f9ee2da..f4bc1a0d9f 100644 --- a/translations/zh-Hant.json +++ b/translations/zh-Hant.json @@ -581,6 +581,7 @@ "entity": "相關物件", "group": "以下群組部分", "integration": "整合", + "no_related_found": "找不到相關物件。", "scene": "以下場景部分", "script": "以下腳本部分" }, @@ -630,6 +631,7 @@ "unavailable": "該物件目前不可用。", "update": "更新" }, + "no_unique_id": "此物件不包含唯一 ID、因此無法由 UI 進行管理設定。", "related": "相關", "settings": "設定" }, @@ -1323,6 +1325,7 @@ "filter": { "filter": "過濾器", "show_disabled": "顯示關閉物件", + "show_readonly": "顯示唯讀物件", "show_unavailable": "顯示無法使用物件" }, "header": "物件", @@ -1346,6 +1349,7 @@ "status": { "disabled": "已關閉", "ok": "確定", + "readonly": "唯讀", "unavailable": "不可用" }, "unavailable": "（不可用）" @@ -1701,7 +1705,10 @@ "required_error_msg": "必填欄位", "update": "更新" }, - "edit_home_zone": "家庭的所在位置可透過一般設定進行變更。", + "edit_home_zone": "住家的半徑尚無法由前端進行設定、於地圖上拖拉標示以移動住家位置。", + "edit_home_zone_narrow": "住家的半徑尚無法由前端進行設定、但可以於一般設定中變更其位置。", + "go_to_core_config": "切換至一般設定？", + "home_zone_core_config": "住家的位置可以於一般設定頁面中進行編輯、但半徑尚無法編輯。是否要切換至一般設定？", "introduction": "區域允許您指定地球上的特定區域，當人員進入到此區域時、狀態會顯示為該區域名字。區域同時也能夠作為自動化的觸發器或條件設定。", "no_zones_created_yet": "看起來您還沒有新增任何區域。" }, @@ -1781,7 +1788,7 @@ "listening_to": "監聽：", "notification_event_fired": "事件 {type} 已成功觸發！", "start_listening": "開始監聽", - "stop_listening": "調整監聽", + "stop_listening": "停止監聽", "subscribe_to": "訂閱事件", "title": "事件", "type": "事件類別" @@ -1825,7 +1832,7 @@ "payload": "負載（允取模版）", "publish": "發佈", "start_listening": "開始監聽", - "stop_listening": "調整監聽", + "stop_listening": "停止監聽", "subscribe_to": "訂閱主題", "title": "MQTT", "topic": "主題" From 2c58a9f802aeb0a6296e10d15800910722467325 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Tue, 18 Feb 2020 23:20:32 -0500 Subject: [PATCH 20/26] Sensor Stroke Width Fix (#4916) * Sensor width fix * Const --- src/panels/lovelace/cards/hui-sensor-card.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts index 7452cdb845..3b10e7eb9f 100644 --- a/src/panels/lovelace/cards/hui-sensor-card.ts +++ b/src/panels/lovelace/cards/hui-sensor-card.ts @@ -27,6 +27,8 @@ import { SensorCardConfig } from "./types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { actionHandler } from "../common/directives/action-handler-directive"; +const strokeWidth = 5; + const average = (items): number => { return ( items.reduce((sum, entry) => sum + parseFloat(entry.state), 0) / @@ -101,7 +103,8 @@ const calcPoints = ( if (item) { last = [average(item), lastValue(item)]; } - const y = height - ((item ? last[0] : last[1]) - min) / yRatio; + const y = + height + strokeWidth / 2 - ((item ? last[0] : last[1]) - min) / yRatio; return coords.push([x, y]); }; @@ -257,7 +260,7 @@ class HuiSensorCard extends LitElement implements LovelaceCard { Date: Wed, 19 Feb 2020 01:36:49 -0500 Subject: [PATCH 21/26] Sensor Card - Top Margin 16px -> 8px (#4917) --- src/panels/lovelace/cards/hui-sensor-card.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts index 3b10e7eb9f..40f0c92cae 100644 --- a/src/panels/lovelace/cards/hui-sensor-card.ts +++ b/src/panels/lovelace/cards/hui-sensor-card.ts @@ -401,7 +401,7 @@ class HuiSensorCard extends LitElement implements LovelaceCard { } .header { - margin: 16px 16px 0; + margin: 8px 16px 0; justify-content: space-between; } From 68baeb83cb19736f5bb43e01c24f94298ce35170 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Wed, 19 Feb 2020 04:19:57 -0500 Subject: [PATCH 22/26] Media Card Seek Functionality (#4907) * Seek function * Remove a testing section * reviews --- src/data/media-player.ts | 1 + .../lovelace/cards/hui-media-control-card.ts | 24 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/data/media-player.ts b/src/data/media-player.ts index ddf024ac98..6a23e8d5ec 100644 --- a/src/data/media-player.ts +++ b/src/data/media-player.ts @@ -3,6 +3,7 @@ import { HomeAssistant } from "../types"; import { timeCachePromiseFunc } from "../common/util/time-cache-function-promise"; export const SUPPORT_PAUSE = 1; +export const SUPPORT_SEEK = 2; export const SUPPORT_VOLUME_SET = 4; export const SUPPORT_VOLUME_MUTE = 8; export const SUPPORT_PREVIOUS_TRACK = 16; diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 6a319b4122..236eb8517e 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -26,6 +26,7 @@ import { SUPPORTS_PLAY, fetchMediaPlayerThumbnailWithCache, SUPPORT_STOP, + SUPPORT_SEEK, } from "../../../data/media-player"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { HomeAssistant, MediaEntity } from "../../../types"; @@ -118,7 +119,10 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { this._handleSeek(e, stateObj)} > `}
@@ -273,6 +277,20 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { }); } + private _handleSeek(e: MouseEvent, stateObj: MediaEntity): void { + if (!supportsFeature(stateObj, SUPPORT_SEEK)) { + return; + } + + const percent = e.offsetX / this.offsetWidth; + const position = (e.currentTarget! as any).max * percent; + + this.hass!.callService("media_player", "media_seek", { + entity_id: this._config!.entity, + seek_position: position, + }); + } + static get styles(): CSSResult { return css` .ratio { @@ -383,6 +401,10 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { --paper-progress-active-color: var(--accent-color); --paper-progress-container-color: rgba(200, 200, 200, 0.5); } + + .seek:hover { + --paper-progress-height: 8px; + } `; } } From 4be1040a149c38349db1245ef413451743888dc9 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Wed, 19 Feb 2020 04:20:37 -0500 Subject: [PATCH 23/26] Convert History Graph Card to Typescript (#4882) * Converting History Graph to Typescript * Conversion to TS * Reviews * Review Updates --- src/data/cached-history.ts | 2 +- .../lovelace/cards/hui-history-graph-card.js | 99 ----------- .../lovelace/cards/hui-history-graph-card.ts | 168 ++++++++++++++++++ src/panels/lovelace/cards/types.ts | 7 + .../hui-history-graph-card-editor.ts | 2 +- 5 files changed, 177 insertions(+), 101 deletions(-) delete mode 100644 src/panels/lovelace/cards/hui-history-graph-card.js create mode 100644 src/panels/lovelace/cards/hui-history-graph-card.ts diff --git a/src/data/cached-history.ts b/src/data/cached-history.ts index b74e212071..005610e33c 100644 --- a/src/data/cached-history.ts +++ b/src/data/cached-history.ts @@ -9,7 +9,7 @@ import { HomeAssistant } from "../types"; import { HassEntity } from "home-assistant-js-websocket"; import { LocalizeFunc } from "../common/translations/localize"; -interface CacheConfig { +export interface CacheConfig { refresh: number; cacheKey: string; hoursToShow: number; diff --git a/src/panels/lovelace/cards/hui-history-graph-card.js b/src/panels/lovelace/cards/hui-history-graph-card.js deleted file mode 100644 index cf11b68bb9..0000000000 --- a/src/panels/lovelace/cards/hui-history-graph-card.js +++ /dev/null @@ -1,99 +0,0 @@ -import { html } from "@polymer/polymer/lib/utils/html-tag"; -import { PolymerElement } from "@polymer/polymer/polymer-element"; - -import "../../../components/ha-card"; -import "../../../components/state-history-charts"; -import "../../../data/ha-state-history-data"; - -import { processConfigEntities } from "../common/process-config-entities"; - -class HuiHistoryGraphCard extends PolymerElement { - static async getConfigElement() { - await import( - /* webpackChunkName: "hui-history-graph-card-editor" */ "../editor/config-elements/hui-history-graph-card-editor" - ); - return document.createElement("hui-history-graph-card-editor"); - } - - static getStubConfig() { - return { entities: [] }; - } - - static get template() { - return html` - - - -
- - -
- - `; - } - - static get properties() { - return { - hass: Object, - _config: Object, - _names: Object, - _entities: Array, - - _stateHistory: Object, - _stateHistoryLoading: Boolean, - _cacheConfig: Object, - }; - } - - getCardSize() { - return 4; - } - - setConfig(config) { - const entities = processConfigEntities(config.entities); - - this._config = config; - - const _entities = []; - const _names = {}; - entities.forEach((entity) => { - _entities.push(entity.entity); - if (entity.name) { - _names[entity.entity] = entity.name; - } - }); - - this.setProperties({ - _cacheConfig: { - cacheKey: _entities.join(), - hoursToShow: config.hours_to_show || 24, - refresh: config.refresh_interval || 0, - }, - _entities, - _names, - }); - } -} - -customElements.define("hui-history-graph-card", HuiHistoryGraphCard); diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts new file mode 100644 index 0000000000..4618751429 --- /dev/null +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -0,0 +1,168 @@ +import { + html, + LitElement, + TemplateResult, + customElement, + property, + css, + CSSResult, + PropertyValues, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; + +import "../../../components/ha-card"; +import "../../../components/state-history-charts"; +import "../../../data/ha-state-history-data"; + +import { getRecentWithCache, CacheConfig } from "../../../data/cached-history"; +import { processConfigEntities } from "../common/process-config-entities"; +import { HomeAssistant } from "../../../types"; +import { HistoryGraphCardConfig } from "./types"; +import { LovelaceCard } from "../types"; +import { EntityConfig } from "../entity-rows/types"; + +@customElement("hui-history-graph-card") +export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { + public static async getConfigElement() { + await import( + /* webpackChunkName: "hui-history-graph-card-editor" */ "../editor/config-elements/hui-history-graph-card-editor" + ); + return document.createElement("hui-history-graph-card-editor"); + } + + public static getStubConfig() { + return { entities: [] }; + } + + @property() public hass?: HomeAssistant; + @property() private _stateHistory?: any; + @property() private _config?: HistoryGraphCardConfig; + private _configEntities?: EntityConfig[]; + private _names: { [key: string]: string } = {}; + private _cacheConfig?: CacheConfig; + private _interval?: number; + + public getCardSize(): number { + return 4; + } + + public setConfig(config: HistoryGraphCardConfig): void { + if (!config.entities) { + throw new Error("Entities must be defined"); + } + + if (config.entities && !Array.isArray(config.entities)) { + throw new Error("Entities need to be an array"); + } + + this._config = { theme: "default", ...config }; + this._configEntities = config.entities + ? processConfigEntities(config.entities) + : []; + + const _entities: string[] = []; + + this._configEntities.forEach((entity) => { + _entities.push(entity.entity); + if (entity.name) { + this._names[entity.entity] = entity.name; + } + }); + + this._cacheConfig = { + cacheKey: _entities.join(), + hoursToShow: config.hours_to_show || 24, + refresh: config.refresh_interval || 0, + }; + } + + public disconnectedCallback(): void { + super.disconnectedCallback(); + this._clearInterval(); + } + + protected updated(changedProps: PropertyValues) { + super.updated(changedProps); + if (!this._config || !this.hass || !this._cacheConfig) { + return; + } + + const oldConfig = changedProps.get("_config") as + | HistoryGraphCardConfig + | undefined; + + if (oldConfig !== this._config) { + this._getStateHistory(); + this._clearInterval(); + + if (!this._interval && this._cacheConfig.refresh) { + this._interval = window.setInterval(() => { + this._getStateHistory(); + }, this._cacheConfig.refresh * 1000); + } + } + } + + protected render(): TemplateResult { + if (!this.hass || !this._config) { + return html``; + } + + return html` + +
+ +
+ + `; + } + + private _getStateHistory(): void { + getRecentWithCache( + this.hass!, + this._cacheConfig!.cacheKey, + this._cacheConfig!, + this.hass!.localize, + this.hass!.language + ).then((stateHistory) => { + this._stateHistory = { + ...this._stateHistory, + ...stateHistory, + }; + }); + } + + private _clearInterval(): void { + if (this._interval) { + window.clearInterval(this._interval); + this._interval = undefined; + } + } + + static get styles(): CSSResult { + return css` + .content { + padding: 16px; + } + .has-header { + padding-top: 0; + } + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-history-graph-card": HuiHistoryGraphCard; + } +} diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts index 141a7874a4..a80103fcf9 100644 --- a/src/panels/lovelace/cards/types.ts +++ b/src/panels/lovelace/cards/types.ts @@ -153,6 +153,13 @@ export interface MediaControlCardConfig extends LovelaceCardConfig { entity: string; } +export interface HistoryGraphCardConfig extends LovelaceCardConfig { + entities: Array; + hours_to_show?: number; + refresh_interval?: number; + title?: string; +} + export interface PictureCardConfig extends LovelaceCardConfig { image?: string; tap_action?: ActionConfig; diff --git a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts index 081466600d..ffa079ca3d 100644 --- a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts @@ -14,10 +14,10 @@ import { EntitiesEditorEvent, EditorTarget } from "../types"; import { HomeAssistant } from "../../../../types"; import { LovelaceCardEditor } from "../../types"; import { fireEvent } from "../../../../common/dom/fire_event"; -import { HistoryGraphCardConfig } from "../../cards/hui-history-graph-card"; import { EntityConfig } from "../../entity-rows/types"; import { processEditorEntities } from "../process-editor-entities"; import { configElementStyle } from "./config-elements-style"; +import { HistoryGraphCardConfig } from "../../cards/types"; const entitiesConfigStruct = struct.union([ { From 7046cba1f7748ed0e46f61420007cabb489c7997 Mon Sep 17 00:00:00 2001 From: Ian Richardson Date: Wed, 19 Feb 2020 03:25:42 -0600 Subject: [PATCH 24/26] =?UTF-8?q?=E2=9C=A8=20Add=20buttons=20row=20(#4714)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ Add buttons row * refactor to composition * Add action handler * address review --- .../lovelace/components/hui-buttons-base.ts | 102 ++++++++++++++++++ .../create-element/create-row-element.ts | 1 + src/panels/lovelace/entity-rows/types.ts | 8 +- .../hui-buttons-header-footer.ts | 80 +++----------- src/panels/lovelace/header-footer/types.ts | 3 +- .../lovelace/special-rows/hui-buttons-row.ts | 47 ++++++++ 6 files changed, 171 insertions(+), 70 deletions(-) create mode 100644 src/panels/lovelace/components/hui-buttons-base.ts create mode 100644 src/panels/lovelace/special-rows/hui-buttons-row.ts diff --git a/src/panels/lovelace/components/hui-buttons-base.ts b/src/panels/lovelace/components/hui-buttons-base.ts new file mode 100644 index 0000000000..b7c51f1c35 --- /dev/null +++ b/src/panels/lovelace/components/hui-buttons-base.ts @@ -0,0 +1,102 @@ +import { + html, + LitElement, + TemplateResult, + customElement, + css, + CSSResult, + queryAll, + property, +} from "lit-element"; +import "@material/mwc-ripple"; + +import "../../../components/entity/state-badge"; +import "../../../components/ha-icon"; + +import { HomeAssistant } from "../../../types"; +import { computeTooltip } from "../common/compute-tooltip"; +// tslint:disable-next-line: no-duplicate-imports +import { StateBadge } from "../../../components/entity/state-badge"; +import { actionHandler } from "../common/directives/action-handler-directive"; +import { hasAction } from "../common/has-action"; +import { ActionHandlerEvent } from "../../../data/lovelace"; +import { handleAction } from "../common/handle-action"; +import { EntitiesCardEntityConfig } from "../cards/types"; + +@customElement("hui-buttons-base") +export class HuiButtonsBase extends LitElement { + @property() public configEntities?: EntitiesCardEntityConfig[]; + @queryAll("state-badge") protected _badges!: StateBadge[]; + private _hass?: HomeAssistant; + + set hass(hass: HomeAssistant) { + this._hass = hass; + this._badges.forEach((badge, index: number) => { + badge.hass = hass; + badge.stateObj = hass.states[this.configEntities![index].entity]; + }); + } + + protected render(): TemplateResult | void { + return html` + ${(this.configEntities || []).map((entityConf) => { + const stateObj = this._hass!.states[entityConf.entity]; + if (!stateObj) { + return html`
`; + } + + return html` +
+ + +
+ `; + })} + `; + } + + private _handleAction(ev: ActionHandlerEvent) { + const config = (ev.currentTarget as any).config as EntitiesCardEntityConfig; + handleAction( + this, + this.hass!, + { tap_action: { action: "toggle" }, ...config }, + ev.detail.action! + ); + } + + static get styles(): CSSResult { + return css` + :host { + display: flex; + justify-content: space-evenly; + } + .missing { + color: #fce588; + } + state-badge { + cursor: pointer; + } + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-buttons-base": HuiButtonsBase; + } +} diff --git a/src/panels/lovelace/create-element/create-row-element.ts b/src/panels/lovelace/create-element/create-row-element.ts index b33b419667..d23464f7fb 100644 --- a/src/panels/lovelace/create-element/create-row-element.ts +++ b/src/panels/lovelace/create-element/create-row-element.ts @@ -35,6 +35,7 @@ const LAZY_LOAD_TYPES = { section: () => import("../special-rows/hui-section-row"), weblink: () => import("../special-rows/hui-weblink-row"), cast: () => import("../special-rows/hui-cast-row"), + buttons: () => import("../special-rows/hui-buttons-row"), }; const DOMAIN_TO_ELEMENT_TYPE = { _domain_not_found: "text", diff --git a/src/panels/lovelace/entity-rows/types.ts b/src/panels/lovelace/entity-rows/types.ts index 28c740e719..6034c5b3b2 100644 --- a/src/panels/lovelace/entity-rows/types.ts +++ b/src/panels/lovelace/entity-rows/types.ts @@ -42,13 +42,19 @@ export interface CastConfig { // Hide the row if either unsupported browser or no API available. hide_if_unavailable: boolean; } +export interface ButtonsRowConfig { + type: "buttons"; + entities: Array; +} export type LovelaceRowConfig = | EntityConfig | DividerConfig | SectionConfig | WeblinkConfig | CallServiceConfig - | CastConfig; + | CastConfig + | ButtonsRowConfig + | ConditionalRowConfig; export interface LovelaceRow extends HTMLElement { hass?: HomeAssistant; diff --git a/src/panels/lovelace/header-footer/hui-buttons-header-footer.ts b/src/panels/lovelace/header-footer/hui-buttons-header-footer.ts index 35e3b6eefd..0f53f9a1b4 100644 --- a/src/panels/lovelace/header-footer/hui-buttons-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-buttons-header-footer.ts @@ -1,28 +1,18 @@ import { - html, - LitElement, - TemplateResult, customElement, - css, - CSSResult, - queryAll, + LitElement, + html, + property, + TemplateResult, } from "lit-element"; -import "@material/mwc-ripple"; -import "../../../components/entity/state-badge"; -import "../../../components/ha-card"; -import "../../../components/ha-icon"; -import "../components/hui-warning-element"; +import "../components/hui-buttons-base"; -import { HomeAssistant } from "../../../types"; import { LovelaceHeaderFooter } from "../types"; import { ButtonsHeaderFooterConfig } from "./types"; -import { EntityConfig } from "../entity-rows/types"; import { processConfigEntities } from "../common/process-config-entities"; -import { toggleEntity } from "../common/entity/toggle-entity"; -import { computeTooltip } from "../common/compute-tooltip"; -// tslint:disable-next-line: no-duplicate-imports -import { StateBadge } from "../../../components/entity/state-badge"; +import { EntityConfig } from "../entity-rows/types"; +import { HomeAssistant } from "../../../types"; @customElement("hui-buttons-header-footer") export class HuiButtonsHeaderFooter extends LitElement @@ -31,66 +21,20 @@ export class HuiButtonsHeaderFooter extends LitElement return { entities: [] }; } + @property() public hass?: HomeAssistant; private _configEntities?: EntityConfig[]; - private _hass?: HomeAssistant; - @queryAll("state-badge") private _badges!: StateBadge[]; public setConfig(config: ButtonsHeaderFooterConfig): void { this._configEntities = processConfigEntities(config.entities); this.requestUpdate(); } - set hass(hass: HomeAssistant) { - this._hass = hass; - this._badges.forEach((badge, index: number) => { - badge.hass = hass; - badge.stateObj = hass.states[this._configEntities![index].entity]; - }); - } - protected render(): TemplateResult | void { return html` - ${(this._configEntities || []).map((entityConf) => { - const stateObj = this._hass!.states[entityConf.entity]; - if (!stateObj) { - return html`
`; - } - - return html` -
- - -
- `; - })} - `; - } - - private async _toggle(ev) { - await toggleEntity(this._hass!, ev.target.stateObj.entity_id); - } - - static get styles(): CSSResult { - return css` - :host { - display: flex; - justify-content: space-evenly; - } - .missing { - color: #fce588; - } - state-badge { - cursor: pointer; - } + `; } } diff --git a/src/panels/lovelace/header-footer/types.ts b/src/panels/lovelace/header-footer/types.ts index 65c4ba6c7f..78d5d55547 100644 --- a/src/panels/lovelace/header-footer/types.ts +++ b/src/panels/lovelace/header-footer/types.ts @@ -1,13 +1,14 @@ import { ActionConfig } from "../../../data/lovelace"; import { struct } from "../common/structs/struct"; import { actionConfigStruct, entitiesConfigStruct } from "../editor/types"; +import { EntityConfig } from "../entity-rows/types"; export interface LovelaceHeaderFooterConfig { type: string; } export interface ButtonsHeaderFooterConfig extends LovelaceHeaderFooterConfig { - entities: string[]; + entities: Array; } export interface PictureHeaderFooterConfig extends LovelaceHeaderFooterConfig { diff --git a/src/panels/lovelace/special-rows/hui-buttons-row.ts b/src/panels/lovelace/special-rows/hui-buttons-row.ts new file mode 100644 index 0000000000..e685bb0bda --- /dev/null +++ b/src/panels/lovelace/special-rows/hui-buttons-row.ts @@ -0,0 +1,47 @@ +import { + customElement, + LitElement, + html, + property, + TemplateResult, +} from "lit-element"; + +import "../components/hui-buttons-base"; + +import { + ButtonsRowConfig, + EntityConfig, + LovelaceRow, +} from "../entity-rows/types"; +import { processConfigEntities } from "../common/process-config-entities"; +import { HomeAssistant } from "../../../types"; + +@customElement("hui-buttons-row") +export class HuiButtonsRow extends LitElement implements LovelaceRow { + public static getStubConfig(): object { + return { entities: [] }; + } + + @property() public hass?: HomeAssistant; + private _configEntities?: EntityConfig[]; + + public setConfig(config: ButtonsRowConfig): void { + this._configEntities = processConfigEntities(config.entities); + this.requestUpdate(); + } + + protected render(): TemplateResult | void { + return html` + + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-buttons-row": HuiButtonsRow; + } +} From 23f34fa7ae239da6e9e55ba82090306709669f7b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 19 Feb 2020 10:30:14 +0100 Subject: [PATCH 25/26] Bumped version to 20200219.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4203a11a97..1db707edd4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200217.0", + version="20200219.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors", From 924c7804c99b097031e755c6733766fc5e953bef Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 19 Feb 2020 10:44:42 +0100 Subject: [PATCH 26/26] Update hui-media-control-card.ts (#4919) --- .../lovelace/cards/hui-media-control-card.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts index 236eb8517e..d596f0befe 100644 --- a/src/panels/lovelace/cards/hui-media-control-card.ts +++ b/src/panels/lovelace/cards/hui-media-control-card.ts @@ -213,10 +213,9 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { applyThemesOnElement(this, this.hass.themes, this._config.theme); } - const oldImage = oldHass - ? oldHass.states[this._config.entity].attributes.entity_picture - : undefined; - const newImage = this.hass.states[this._config.entity].attributes + const oldImage = + oldHass?.states[this._config.entity]?.attributes.entity_picture; + const newImage = this.hass.states[this._config.entity]?.attributes .entity_picture; if (!newImage || newImage === oldImage) { @@ -229,11 +228,13 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard { return; } - fetchMediaPlayerThumbnailWithCache(this.hass, this._config.entity).then( - ({ content_type, content }) => { + fetchMediaPlayerThumbnailWithCache(this.hass, this._config.entity) + .then(({ content_type, content }) => { this._image = `data:${content_type};base64,${content}`; - } - ); + }) + .catch(() => { + this._image = undefined; + }); } private _computeSecondaryTitle(stateObj: HassEntity): string {