From c8cda3c8170fb609e7bcbb23169d39704c3915ff Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 18 Feb 2019 18:41:56 -0800 Subject: [PATCH 01/11] Add person icon (#2789) --- src/common/entity/domain_icon.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts index 5c6ac2a181..9971b9e66c 100644 --- a/src/common/entity/domain_icon.ts +++ b/src/common/entity/domain_icon.ts @@ -28,6 +28,7 @@ const fixedIcons = { light: "hass:lightbulb", mailbox: "hass:mailbox", notify: "hass:comment-alert", + person: "hass:account", plant: "hass:flower", proximity: "hass:apple-safari", remote: "hass:remote", From 79a59475878e5f8427b1da818907c71ec5d95bdd Mon Sep 17 00:00:00 2001 From: shbatm Date: Mon, 18 Feb 2019 23:47:15 -0600 Subject: [PATCH 02/11] Add missing localization for Fan Mode in Climate More Info (#2716) * Add missing localization for Fan Mode in Climate More Info * Separate Climate Fan Mode from Operation Mode * Separated out climate.fan_mode into state_attributess Separated out climate.fan_mode into state_attributess * Fix bad merge and update localizeFanMode funtion. --- src/dialogs/more-info/controls/more-info-climate.js | 6 +++++- src/translations/en.json | 9 +++++++++ translations/en.json | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/dialogs/more-info/controls/more-info-climate.js b/src/dialogs/more-info/controls/more-info-climate.js index 27d29d228b..eac739b482 100644 --- a/src/dialogs/more-info/controls/more-info-climate.js +++ b/src/dialogs/more-info/controls/more-info-climate.js @@ -227,7 +227,7 @@ class MoreInfoClimate extends LocalizeMixin(EventsMixin(PolymerElement)) { items="[[stateObj.attributes.fan_list]]" on-dom-change="handleFanListUpdate" > - [[item]] + [[_localizeFanMode(localize, item)]] @@ -553,6 +553,10 @@ class MoreInfoClimate extends LocalizeMixin(EventsMixin(PolymerElement)) { _localizeOperationMode(localize, mode) { return localize(`state.climate.${mode}`) || mode; } + + _localizeFanMode(localize, mode) { + return localize(`state_attributes.climate.fan_mode.${mode}`) || mode; + } } customElements.define("more-info-climate", MoreInfoClimate); diff --git a/src/translations/en.json b/src/translations/en.json index 9797982c17..664d94b416 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -315,6 +315,15 @@ } } }, + "state_attributes": { + "climate": { + "fan_mode": { + "off": "[%key:state::default::off%]", + "on": "[%key:state::default::on%]", + "auto": "[%key:state::climate::auto%]" + } + } + }, "state_badge": { "default": { "unknown": "Unk", diff --git a/translations/en.json b/translations/en.json index c3b4e5d8e9..c019effcb5 100644 --- a/translations/en.json +++ b/translations/en.json @@ -267,6 +267,15 @@ "returning": "Returning to dock" } }, + "state_attributes": { + "climate": { + "fan_mode": { + "off": "Off", + "on": "On", + "auto": "Auto" + } + } + }, "state_badge": { "default": { "unknown": "Unk", From 32d0e8bf1d9ff23f3c189d83fab5468a4cb505fa Mon Sep 17 00:00:00 2001 From: Ian Richardson Date: Tue, 19 Feb 2019 00:16:18 -0600 Subject: [PATCH 03/11] less broken thermostat-card (#2793) * Update hui-thermostat-card.ts * made light and thermo more consistent --- src/panels/lovelace/cards/hui-light-card.ts | 1 + src/panels/lovelace/cards/hui-thermostat-card.ts | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index 7e30776ef1..fa5bee5536 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -135,6 +135,7 @@ export class HuiLightCard extends LitElement implements LovelaceCard { const stateObj = this.hass!.states[this._config!.entity] as LightEntity; if (!stateObj) { + // Card will require refresh to work again return; } diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index 21c5d70614..071f324306 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -213,6 +213,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { private get _stepSize(): number { const stateObj = this.hass!.states[this._config!.entity]; + if (stateObj.attributes.target_temp_step) { return stateObj.attributes.target_temp_step; } @@ -220,6 +221,13 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { } private async _initialLoad(): Promise { + const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity; + + if (!stateObj) { + // Card will require refresh to work again + return; + } + this._loaded = true; await this.updateComplete; @@ -233,15 +241,13 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { (this.shadowRoot!.querySelector( "#thermostat" - )! as HTMLElement).style.height = radius * 2 + "px"; + ) as HTMLElement)!.style.height = radius * 2 + "px"; const loaded = await loadRoundslider(); this._roundSliderStyle = loaded.roundSliderStyle; this._jQuery = loaded.jQuery; - const stateObj = this.hass!.states[this._config!.entity] as ClimateEntity; - const _sliderType = stateObj.attributes.target_temp_low && stateObj.attributes.target_temp_high From 12064a086b93b022ae0023229b8e7762154a35ad Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 19 Feb 2019 09:09:07 -0800 Subject: [PATCH 04/11] Fix attribute-prop mapping (#2794) --- src/components/entity/ha-entities-picker.ts | 7 ++++--- src/components/entity/ha-entity-picker.ts | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts index 5fe0720c95..684ef67dc1 100644 --- a/src/components/entity/ha-entities-picker.ts +++ b/src/components/entity/ha-entities-picker.ts @@ -22,9 +22,10 @@ import { HassEntity } from "home-assistant-js-websocket"; class HaEntitiesPickerLight extends LitElement { @property() public hass?: HomeAssistant; @property() public value?: string[]; - @property() public domainFilter?: string; - @property() public pickedEntityLabel?: string; - @property() public pickEntityLabel?: string; + @property({ attribute: "domain-filter" }) public domainFilter?: string; + @property({ attribute: "picked-entity-label" }) + public pickedEntityLabel?: string; + @property({ attribute: "pick-entity-label" }) public pickEntityLabel?: string; protected render(): TemplateResult | void { if (!this.hass) { diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index 3b5bf7ed88..53f0b74db2 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -55,11 +55,12 @@ const rowRenderer = ( class HaEntityPicker extends LitElement { @property({ type: Boolean }) public autofocus?: boolean; @property({ type: Boolean }) public disabled?: boolean; - @property({ type: Boolean }) public allowCustomEntity; + @property({ type: Boolean, attribute: "allow-custom-entity" }) + public allowCustomEntity; @property() public hass?: HomeAssistant; @property() public label?: string; @property() public value?: string; - @property() public domainFilter?: string; + @property({ attribute: "domain-filter" }) public domainFilter?: string; @property() public entityFilter?: HaEntityPickerEntityFilterFunc; @property({ type: Boolean }) private _opened?: boolean; @property() private _hass?: HomeAssistant; From 5ba1cc5075e5bcbd180fe8ccd85053990c4560ec Mon Sep 17 00:00:00 2001 From: Timmo Date: Tue, 19 Feb 2019 17:09:44 +0000 Subject: [PATCH 05/11] :fire: Fixes entity-button icon color (#2796) --- src/panels/lovelace/cards/hui-entity-button-card.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts index a591a7dc4e..4d7a9cd2bf 100644 --- a/src/panels/lovelace/cards/hui-entity-button-card.ts +++ b/src/panels/lovelace/cards/hui-entity-button-card.ts @@ -177,7 +177,7 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard { if (!stateObj.attributes.hs_color) { return ""; } - const { hue, sat } = stateObj.attributes.hs_color; + const [hue, sat] = stateObj.attributes.hs_color; if (sat <= 10) { return ""; } From 90c09e967ae6f8fc5c5f2d9cf0525ed5bfcf8e45 Mon Sep 17 00:00:00 2001 From: Timmo Date: Tue, 19 Feb 2019 17:10:58 +0000 Subject: [PATCH 06/11] :hammer: Make edit card only close with cancel or save (#2798) --- src/panels/lovelace/editor/card-editor/hui-edit-card.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts index 57eed26870..068e96f723 100644 --- a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts @@ -138,6 +138,7 @@ export class HuiEditCard extends LitElement {

From 8a9594d918ccdced3939026be7dc9a6e381be7e2 Mon Sep 17 00:00:00 2001 From: yosilevy <37745463+yosilevy@users.noreply.github.com> Date: Tue, 19 Feb 2019 19:12:05 +0200 Subject: [PATCH 07/11] Fix missing focus on editor when dialog loaded (#2799) --- src/panels/lovelace/editor/card-editor/hui-edit-card.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts index 068e96f723..bf2f7df114 100644 --- a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts @@ -201,6 +201,7 @@ export class HuiEditCard extends LitElement { afterNextRender(() => { this.yamlEditor.codemirror.refresh(); this._resizeDialog(); + this.yamlEditor.codemirror.focus(); }); } } From 7904483272c982f8376111cc9dc060c40fd987a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Tue, 19 Feb 2019 18:20:21 +0100 Subject: [PATCH 08/11] Register closeEditor as property of hui-editor (#2797) * Register closeEditor as property of hui-editor * Belt and suspenders * Update hui-editor.ts --- src/panels/lovelace/hui-editor.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts index 36aa892040..02d5a395bd 100644 --- a/src/panels/lovelace/hui-editor.ts +++ b/src/panels/lovelace/hui-editor.ts @@ -38,6 +38,7 @@ class LovelaceFullConfigEditor extends LitElement { return { hass: {}, lovelace: {}, + closeEditor: {}, _saving: {}, _changed: {}, }; @@ -150,7 +151,9 @@ class LovelaceFullConfigEditor extends LitElement { } } window.onbeforeunload = null; - this.closeEditor!(); + if (this.closeEditor) { + this.closeEditor(); + } } private async _handleSave() { From 9efcca002da71634f6dafc3f336ed3507f28cdf7 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 19 Feb 2019 09:22:12 -0800 Subject: [PATCH 09/11] Update translations --- translations/ca.json | 9 +++++++++ translations/da.json | 9 +++++++++ translations/en.json | 18 +++++++++--------- translations/ko.json | 11 ++++++++++- translations/lb.json | 9 +++++++++ translations/ru.json | 9 +++++++++ translations/zh-Hans.json | 7 +++++++ 7 files changed, 62 insertions(+), 10 deletions(-) diff --git a/translations/ca.json b/translations/ca.json index 8787a36474..7da86f1f79 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -265,6 +265,11 @@ "on": "Encesa", "paused": "Pausada", "returning": "Retornant a la base" + }, + "timer": { + "active": "actiu", + "idle": "inactiu", + "paused": "en pausa" } }, "state_badge": { @@ -860,6 +865,10 @@ "unused_entities": "Entitats sense utilitzar", "help": "Ajuda", "refresh": "Actualitzar" + }, + "warning": { + "entity_not_found": "Entitat no disponible: {entity}", + "entity_non_numeric": "Entitat no numèrica: {entity}" } } }, diff --git a/translations/da.json b/translations/da.json index 4b726f3e12..f2b44ed3e9 100644 --- a/translations/da.json +++ b/translations/da.json @@ -265,6 +265,11 @@ "on": "On", "paused": "Sat på pause", "returning": "Vender tilbage til dock" + }, + "timer": { + "active": "aktiv", + "idle": "inaktiv", + "paused": "pause" } }, "state_badge": { @@ -860,6 +865,10 @@ "unused_entities": "Ubrugte enheder", "help": "Hjælp", "refresh": "Opdater" + }, + "warning": { + "entity_not_found": "Enhed ikke tilgængelig: {entity}", + "entity_non_numeric": "Enhed er ikke-numerisk: {entity}" } } }, diff --git a/translations/en.json b/translations/en.json index c019effcb5..886a106c3b 100644 --- a/translations/en.json +++ b/translations/en.json @@ -265,15 +265,11 @@ "on": "On", "paused": "Paused", "returning": "Returning to dock" - } - }, - "state_attributes": { - "climate": { - "fan_mode": { - "off": "Off", - "on": "On", - "auto": "Auto" - } + }, + "timer": { + "active": "active", + "idle": "idle", + "paused": "paused" } }, "state_badge": { @@ -869,6 +865,10 @@ "unused_entities": "Unused entities", "help": "Help", "refresh": "Refresh" + }, + "warning": { + "entity_not_found": "Entity not available: {entity}", + "entity_non_numeric": "Entity is non-numeric: {entity}" } } }, diff --git a/translations/ko.json b/translations/ko.json index ede0790c05..d2863f8e23 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -263,8 +263,13 @@ "idle": "대기중", "off": "꺼짐", "on": "켜짐", - "paused": "일시 중지됨", + "paused": "일시중지됨", "returning": "충전 복귀 중" + }, + "timer": { + "active": "활성화", + "idle": "대기중", + "paused": "일시중지됨" } }, "state_badge": { @@ -860,6 +865,10 @@ "unused_entities": "미사용 구성요소", "help": "도움말", "refresh": "새로고침" + }, + "warning": { + "entity_not_found": "구성요소를 사용할 수 없습니다: {entity}", + "entity_non_numeric": "구성요소가 숫자형식이 아닙니다: {entity}" } } }, diff --git a/translations/lb.json b/translations/lb.json index 204aa9e474..68e3177ad5 100644 --- a/translations/lb.json +++ b/translations/lb.json @@ -265,6 +265,11 @@ "on": "Un", "paused": "Pauseiert", "returning": "Kënnt zur Statioun zeréck" + }, + "timer": { + "active": "Aktiv", + "idle": "Waart", + "paused": "Pauseiert" } }, "state_badge": { @@ -860,6 +865,10 @@ "unused_entities": "Onbenotzt Entitéiten", "help": "Hëllef", "refresh": "Erneieren" + }, + "warning": { + "entity_not_found": "Entitéit net erreechbar: {entitiy}", + "entity_non_numeric": "Entitéit ass net numerescher Natur: {entitiy}" } } }, diff --git a/translations/ru.json b/translations/ru.json index 5a3c8ccbd9..a68ae24be4 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -265,6 +265,11 @@ "on": "Включен", "paused": "Приостановлен", "returning": "Возвращается к док-станции" + }, + "timer": { + "active": "Отсчёт", + "idle": "Ожидание", + "paused": "Пауза" } }, "state_badge": { @@ -860,6 +865,10 @@ "unused_entities": "Неиспользуемые объекты", "help": "Справка", "refresh": "Обновить" + }, + "warning": { + "entity_not_found": "Объект недоступен: {entity}", + "entity_non_numeric": "Объект не является числом: {entity}" } } }, diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json index 854bd21177..3d53559040 100644 --- a/translations/zh-Hans.json +++ b/translations/zh-Hans.json @@ -265,6 +265,10 @@ "on": "开启", "paused": "已暂停", "returning": "正在返回" + }, + "timer": { + "active": "激活", + "idle": "空闲" } }, "state_badge": { @@ -854,6 +858,9 @@ "unused_entities": "未使用的实体", "help": "帮助", "refresh": "刷新" + }, + "warning": { + "entity_not_found": "实体不可用" } } }, From 97deed9299d8738a20b2f1ebf2840e32db5a80bd Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 19 Feb 2019 09:22:15 -0800 Subject: [PATCH 10/11] Bumped version to 20190219.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a1add8ada4..a6770e4a10 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20190218.0", + version="20190219.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors", From 1afb8f109e97e2a5b832cb04a4ec467624c637b9 Mon Sep 17 00:00:00 2001 From: yosilevy <37745463+yosilevy@users.noreply.github.com> Date: Tue, 19 Feb 2019 20:04:33 +0200 Subject: [PATCH 11/11] Localization updates (#2767) * Label localization * Added various missing localization labels + paper-fab RTL location fix (was totally gone behind app-drawer) * Removed ha-markdown from all translations. Refactored links to separate anchors. --- .../area_registry/ha-config-area-registry.ts | 39 +++++++++++++++---- .../config/automation/ha-automation-editor.ts | 14 +++++++ .../config/automation/ha-automation-picker.js | 36 +++++++++++++---- .../ha-config-entity-registry.ts | 22 +++++++---- src/panels/config/js/automation.js | 28 ++++++++----- src/panels/config/script/ha-script-editor.js | 24 ++++++++++++ src/panels/config/script/ha-script-picker.js | 24 ++++++++++++ .../config/users/ha-config-user-picker.js | 23 +++++++++++ src/panels/config/users/ha-dialog-add-user.js | 12 +++--- src/panels/config/users/ha-user-editor.js | 4 +- src/panels/lovelace/hui-view.ts | 12 ++++++ src/translations/en.json | 22 ++++++++--- 12 files changed, 215 insertions(+), 45 deletions(-) diff --git a/src/panels/config/area_registry/ha-config-area-registry.ts b/src/panels/config/area_registry/ha-config-area-registry.ts index dbca7d6ba9..76cb01757b 100644 --- a/src/panels/config/area_registry/ha-config-area-registry.ts +++ b/src/panels/config/area_registry/ha-config-area-registry.ts @@ -27,6 +27,8 @@ import { showAreaRegistryDetailDialog, loadAreaRegistryDetailDialog, } from "./show-dialog-area-registry-detail"; +import { classMap } from "lit-html/directives/class-map"; +import { computeRTL } from "../../../common/util/compute_rtl"; class HaConfigAreaRegistry extends LitElement { public hass?: HomeAssistant; @@ -48,20 +50,25 @@ class HaConfigAreaRegistry extends LitElement { `; } return html` - + ${this.hass.localize("ui.panel.config.area_registry.picker.header")} - Areas are used to organize where devices are. This information will - be used throughout Home Assistant to help you in organizing your - interface, permissions and integrations with other systems. + ${this.hass.localize( + "ui.panel.config.area_registry.picker.introduction" + )}

- To place devices in an area, navigate to - the integrations page and then - click on a configured integration to get to the device cards. + ${this.hass.localize( + "ui.panel.config.area_registry.picker.introduction2" + )}

+ ${this._items.map((entry) => { @@ -94,8 +101,13 @@ class HaConfigAreaRegistry extends LitElement { `; } @@ -188,6 +200,17 @@ All devices in this area will become unassigned.`) bottom: 24px; right: 24px; } + + paper-fab.rtl { + right: auto; + left: 16px; + } + + paper-fab[is-wide].rtl { + bottom: 24px; + right: auto; + left: 24px; + } `; } } diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index 65abc4bcda..93d1ab71ce 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -110,6 +110,9 @@ class HaAutomationEditor extends LitElement { "ui.panel.config.automation.editor.save" )}" @click=${this._saveAutomation} + class="${classMap({ + rtl: computeRTL(this.hass), + })}" > `; @@ -280,6 +283,17 @@ class HaAutomationEditor extends LitElement { paper-fab[dirty] { margin-bottom: 0; } + + paper-fab.rtl { + right: auto; + left: 16px; + } + + paper-fab[is-wide].rtl { + bottom: 24px; + right: auto; + left: 24px; + } `, ]; } diff --git a/src/panels/config/automation/ha-automation-picker.js b/src/panels/config/automation/ha-automation-picker.js index d2dcbff6a3..f7cb80df7f 100644 --- a/src/panels/config/automation/ha-automation-picker.js +++ b/src/panels/config/automation/ha-automation-picker.js @@ -8,7 +8,6 @@ import "@polymer/paper-item/paper-item"; import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; -import "../../../components/ha-markdown"; import "../../../layouts/ha-app-layout"; import "../ha-config-section"; @@ -16,6 +15,8 @@ import "../ha-config-section"; import NavigateMixin from "../../../mixins/navigate-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; import computeStateName from "../../../common/entity/compute_state_name"; +import { computeRTL } from "../../../common/util/compute_rtl"; + /* * @appliesMixin LocalizeMixin * @appliesMixin NavigateMixin @@ -44,12 +45,19 @@ class HaAutomationPicker extends LocalizeMixin(NavigateMixin(PolymerElement)) { right: 24px; } - a { - color: var(--primary-color); + paper-fab[rtl] { + right: auto; + left: 16px; } - ha-markdown p { - margin: 0px; + paper-fab[rtl][is-wide] { + bottom: 24px; + right: auto; + left: 24px; + } + + a { + color: var(--primary-color); } @@ -71,9 +79,10 @@ class HaAutomationPicker extends LocalizeMixin(NavigateMixin(PolymerElement)) { [[localize('ui.panel.config.automation.picker.header')]]
- + [[localize('ui.panel.config.automation.picker.introduction')]] +
`; @@ -131,6 +141,12 @@ class HaAutomationPicker extends LocalizeMixin(NavigateMixin(PolymerElement)) { isWide: { type: Boolean, }, + + rtl: { + type: Boolean, + reflectToAttribute: true, + computed: "_computeRTL(hass)", + }, }; } @@ -158,6 +174,10 @@ class HaAutomationPicker extends LocalizeMixin(NavigateMixin(PolymerElement)) { _backTapped() { history.back(); } + + _computeRTL(hass) { + return computeRTL(hass); + } } customElements.define("ha-automation-picker", HaAutomationPicker); diff --git a/src/panels/config/entity_registry/ha-config-entity-registry.ts b/src/panels/config/entity_registry/ha-config-entity-registry.ts index fb32443e3f..016f03e995 100644 --- a/src/panels/config/entity_registry/ha-config-entity-registry.ts +++ b/src/panels/config/entity_registry/ha-config-entity-registry.ts @@ -51,7 +51,11 @@ class HaConfigEntityRegistry extends LitElement { `; } return html` - + ${this.hass.localize( @@ -59,14 +63,16 @@ class HaConfigEntityRegistry extends LitElement { )} - Home Assistant keeps a registry of every entity it has ever seen - that can be uniquely identified. Each of these entities will have an - entity ID assigned which will be reserved for just this entity. + ${this.hass.localize( + "ui.panel.config.entity_registry.picker.introduction" + )}

- Use the entity registry to override the name, change the entity ID - or remove the entry from Home Assistant. Note, removing the entity - registry entry won't remove the entity. To do that, remove it from - the integrations page. + ${this.hass.localize( + "ui.panel.config.entity_registry.picker.introduction2" + )} +

diff --git a/src/panels/config/js/automation.js b/src/panels/config/js/automation.js index 4c16a8cf52..5c7304c8f6 100644 --- a/src/panels/config/js/automation.js +++ b/src/panels/config/js/automation.js @@ -3,7 +3,6 @@ import { h, Component } from "preact"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-input/paper-input"; import "../ha-config-section"; -import "../../../components/ha-markdown"; import Trigger from "./trigger/index"; import Condition from "./condition/index"; @@ -68,11 +67,14 @@ export default class Automation extends Component { {localize("ui.panel.config.automation.editor.triggers.header")} - + {localize( "ui.panel.config.automation.editor.triggers.introduction" )} - /> +

+ + + - + {localize( "ui.panel.config.automation.editor.conditions.introduction" )} - /> +

+ + + - + {localize( "ui.panel.config.automation.editor.actions.introduction" )} - /> +

+ + +