From 4c702ac7c21ca070c881515848546069cdc572fe Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 6 Apr 2023 14:41:38 +0200 Subject: [PATCH] fix analytics translations in onboarding (#16086) --- src/components/ha-analytics.ts | 18 +++++++++--------- src/onboarding/onboarding-analytics.ts | 6 +++--- src/panels/config/core/ha-config-analytics.ts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/ha-analytics.ts b/src/components/ha-analytics.ts index 9ea3540baa..9faec6a273 100644 --- a/src/components/ha-analytics.ts +++ b/src/components/ha-analytics.ts @@ -2,9 +2,9 @@ import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { fireEvent } from "../common/dom/fire_event"; +import { LocalizeFunc } from "../common/translations/localize"; import type { Analytics, AnalyticsPreferences } from "../data/analytics"; import { haStyle } from "../resources/styles"; -import type { HomeAssistant } from "../types"; import "./ha-settings-row"; import "./ha-switch"; import type { HaSwitch } from "./ha-switch"; @@ -19,7 +19,7 @@ declare global { @customElement("ha-analytics") export class HaAnalytics extends LitElement { - @property({ attribute: false }) public hass!: HomeAssistant; + @property({ attribute: false }) public localize!: LocalizeFunc; @property({ attribute: false }) public analytics?: Analytics; @@ -34,12 +34,12 @@ export class HaAnalytics extends LitElement { return html` - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title` )} - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.description` )} @@ -57,12 +57,12 @@ export class HaAnalytics extends LitElement { html` - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title` )} - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.description` )} @@ -77,7 +77,7 @@ export class HaAnalytics extends LitElement { ${!baseEnabled ? html` - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled` )} @@ -89,12 +89,12 @@ export class HaAnalytics extends LitElement { )} - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title` )} - ${this.hass.localize( + ${this.localize( `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.description` )} diff --git a/src/onboarding/onboarding-analytics.ts b/src/onboarding/onboarding-analytics.ts index cbc4b6aad7..e7aa0502aa 100644 --- a/src/onboarding/onboarding-analytics.ts +++ b/src/onboarding/onboarding-analytics.ts @@ -23,11 +23,11 @@ class OnboardingAnalytics extends LitElement { protected render(): TemplateResult { return html` -

${this.hass.localize("ui.panel.page-onboarding.analytics.intro")}

+

${this.localize("ui.panel.page-onboarding.analytics.intro")}

@@ -41,7 +41,7 @@ class OnboardingAnalytics extends LitElement { target="_blank" rel="noreferrer" > - ${this.hass.localize("ui.panel.page-onboarding.analytics.learn_more")} + ${this.localize("ui.panel.page-onboarding.analytics.learn_more")} `; diff --git a/src/panels/config/core/ha-config-analytics.ts b/src/panels/config/core/ha-config-analytics.ts index 4c506ff7eb..e2b2ffa24a 100644 --- a/src/panels/config/core/ha-config-analytics.ts +++ b/src/panels/config/core/ha-config-analytics.ts @@ -45,7 +45,7 @@ class ConfigAnalytics extends LitElement {