From 5de8c713c89cf669e9554b648e7cc2568f3d502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Wed, 21 Aug 2019 23:03:40 +0200 Subject: [PATCH 1/4] Lovelace markdown card - fix race condition, add variables to template (#3505) * Fix connection race, add variables * Update src/panels/lovelace/cards/hui-markdown-card.ts * Lint --- src/panels/lovelace/cards/hui-markdown-card.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts index 0df7737f5a..612b14f3d0 100644 --- a/src/panels/lovelace/cards/hui-markdown-card.ts +++ b/src/panels/lovelace/cards/hui-markdown-card.ts @@ -48,11 +48,11 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard { } this._config = config; - - this._disconnect(); - if (this._hass) { - this._connect(); - } + this._disconnect().then(() => { + if (this._hass) { + this._connect(); + } + }); } public disconnectedCallback() { @@ -91,6 +91,7 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard { { template: this._config.content, entity_ids: this._config.entity_id, + variables: { config: this._config }, } ); this._unsubRenderTemplate.catch(() => { From 512b76f450432519dbc27813825219bb2bd8d061 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 21 Aug 2019 14:12:43 -0700 Subject: [PATCH 2/4] Update MDI --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7f06e4ca4a..d7d36c6142 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@material/mwc-base": "^0.6.0", "@material/mwc-button": "^0.6.0", "@material/mwc-ripple": "^0.6.0", - "@mdi/svg": "4.0.96", + "@mdi/svg": "4.1.95", "@polymer/app-layout": "^3.0.2", "@polymer/app-localize-behavior": "^3.0.1", "@polymer/app-route": "^3.0.2", diff --git a/yarn.lock b/yarn.lock index 78d8ac5ac2..efc1eb942f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -847,10 +847,10 @@ dependencies: "@material/feature-targeting" "^0.44.1" -"@mdi/svg@4.0.96": - version "4.0.96" - resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-4.0.96.tgz#c534ca24d2d370b91ce90d036f6f04e122d4aa29" - integrity sha512-qL3ymeOLNWhxsDTvRtVMuAuEL/D8dH7tvdm+LeUloWdKGnI4wzhDX/3u3MMXWv7IIar56omxtLEGfqedjDHjGA== +"@mdi/svg@4.1.95": + version "4.1.95" + resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-4.1.95.tgz#6ffb3d77463b04bf2adfbf47b805edaac02d1d69" + integrity sha512-lgt5hW2f6m1xMdymbctBsVt7BI97O5OTKoLC6i4UOdHEQeTQq1E1CMgsUYSGhuENjoas0bi0ISqNBMddIpF/Ig== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" From 9b321124bb7ff143f5f81be32137a8957a9cc5a8 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 21 Aug 2019 14:13:27 -0700 Subject: [PATCH 3/4] Update translations --- translations/hr.json | 25 ++++++++++++++++++++++++- translations/nl.json | 22 +++++++++++----------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/translations/hr.json b/translations/hr.json index e9398a7a83..d0ccfe1677 100644 --- a/translations/hr.json +++ b/translations/hr.json @@ -747,7 +747,10 @@ "unavailable": "Ovaj entitet trenutno nije dostupan.", "default_name": "Novo područje", "delete": "IZBRISATI", - "update": "AŽURIRANJE" + "update": "AŽURIRANJE", + "enabled_label": "Aktiviraj entitet", + "enabled_cause": "Deaktivirano zbog {uzrok}.", + "enabled_description": "Onemogućeni entiteti neće biti dodani u Home Assistant." } }, "person": { @@ -1294,6 +1297,19 @@ "updater": { "title": "Upute za ažuriranje" } + }, + "options_flow": { + "form": { + "header": "Opcije" + }, + "success": { + "description": "Opcije su uspješno spremljene." + } + }, + "config_entry_system_options": { + "title": "Mogućnosti sustava", + "enable_new_entities_label": "Aktiviraj novododane entitete.", + "enable_new_entities_description": "Ako nije aktivno, novootkriveni entiteti neće biti automatski dodani u Home Assistant." } }, "auth_store": { @@ -1389,5 +1405,12 @@ "system-admin": "Administratori", "system-users": "Korisnici", "system-read-only": "Korisnici sa pravima samo za čitanje" + }, + "config_entry": { + "disabled_by": { + "user": "Korisnik", + "integration": "Integracija", + "config_entry": "Stavka konfiguracije" + } } } \ No newline at end of file diff --git a/translations/nl.json b/translations/nl.json index 42f7fe279e..00c32f0ff5 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -426,7 +426,7 @@ "add": "Trigger toevoegen", "duplicate": "Dupliceren", "delete": "Verwijderen", - "delete_confirm": "Zeker dat u wilt verwijderen?", + "delete_confirm": "Zeker dat je wil verwijderen?", "unsupported_platform": "Niet ondersteund platform: {platform}", "type_select": "Trigger-type", "type": { @@ -677,7 +677,7 @@ "config_entry": { "no_devices": "Deze integratie heeft geen apparaten.", "no_device": "Entiteiten zonder apparaten", - "delete_confirm": "Weet u zeker dat u deze integratie wilt verwijderen?", + "delete_confirm": "Weet je zeker dat je deze integratie wilt verwijderen?", "restart_confirm": "Herstart Home Assistant om het verwijderen van deze integratie te voltooien", "manuf": "door {manufacturer}", "via": "Verbonden via", @@ -689,7 +689,7 @@ }, "config_flow": { "external_step": { - "description": "Deze stap vereist dat u een externe website bezoekt om dit te voltooien.", + "description": "Deze stap vereist dat je een externe website bezoekt om dit te voltooien.", "open_site": "Open website" } } @@ -817,7 +817,7 @@ "description": "Elk toegangstoken vertegenwoordigt een inlogsessie. Toegangstokens worden automatisch verwijderd wanneer u op Uitloggen klikt. De volgende toegangstokens zijn momenteel actief voor uw account.", "token_title": "Token voor {clientId}", "created_at": "Gemaakt op {date}", - "confirm_delete": "Weet u zeker dat u de toegangstoken voor {name} wilt verwijderen?", + "confirm_delete": "Weet je zeker dat je de verversingstoken voor {name} wilt verwijderen?", "delete_failed": "Verwijderen van de toegangstoken is mislukt.", "last_used": "Laatst gebruikt op {date} vanaf {location}", "not_used": "Is nog nooit gebruikt", @@ -838,8 +838,8 @@ "last_used": "Laatst gebruikt op {date} vanaf {location}", "not_used": "Is nog nooit gebruikt" }, - "current_user": "U bent momenteel ingelogd als {fullName}.", - "is_owner": "U bent eigenaar.", + "current_user": "Je bent momenteel ingelogd als {fullName}.", + "is_owner": "Je bent eigenaar.", "change_password": { "header": "Wachtwoord wijzigen", "current_password": "Huidige wachtwoord", @@ -852,7 +852,7 @@ "header": "Twee-factor-authenticatie modules", "disable": "Uitschakelen", "enable": "Inschakelen", - "confirm_disable": "Weet u zeker dat u {naam} wilt uitschakelen?" + "confirm_disable": "Weet je zeker dat je {naam} wilt uitschakelen?" }, "mfa_setup": { "title_aborted": "Afgebroken", @@ -869,7 +869,7 @@ }, "page-authorize": { "initializing": "Initialiseren", - "authorizing_client": "U staat op het punt {clientId} toegang te geven tot uw Home Assistant-instantie.", + "authorizing_client": "Je staat op het punt {clientId} toegang te geven tot je Home Assistant-instantie.", "logging_in_with": "Aan het inloggen met **{authProviderName}**.", "pick_auth_provider": "Of log in met", "abort_intro": "Inloggen afgebroken", @@ -930,7 +930,7 @@ "data": { "user": "Gebruiker" }, - "description": "Selecteer een gebruiker waarmee u wilt aanmelden:" + "description": "Selecteer een gebruiker waarmee je je wilt aanmelden:" } }, "abort": { @@ -964,7 +964,7 @@ } }, "page-onboarding": { - "intro": "Bent u klaar om uw huis wakker te maken, uw privacy terug te winnen en deel te nemen aan een wereldwijde gemeenschap van knutselaars?", + "intro": "Ben je klaar om uw huis wakker te maken, uw privacy terug te winnen en deel te nemen aan een wereldwijde gemeenschap van knutselaars?", "user": { "intro": "Laten we beginnen door een gebruikersaccount aan te maken.", "required_field": "Verplicht", @@ -1313,7 +1313,7 @@ } }, "auth_store": { - "ask": "Wilt u de inloggegevens opslaan?", + "ask": "Wil je de inloggegevens opslaan?", "decline": "Nee, bedankt", "confirm": "Login opslaan" }, From ecfbfbf56bf341f5188c561a074bc10d214afa22 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 21 Aug 2019 14:13:32 -0700 Subject: [PATCH 4/4] Bumped version to 20190821.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ce624d6f53..4d8a608959 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20190820.1", + version="20190821.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",