diff --git a/package.json b/package.json index f2b154657c..12dfb85e21 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "@material/mwc-switch": "^0.13.0", "@mdi/svg": "4.9.95", "@polymer/app-layout": "^3.0.2", - "@polymer/app-localize-behavior": "^3.0.1", "@polymer/app-route": "^3.0.2", "@polymer/app-storage": "^3.0.2", "@polymer/font-roboto": "^3.0.2", @@ -91,7 +90,7 @@ "google-timezones-json": "^1.0.2", "hls.js": "^0.12.4", "home-assistant-js-websocket": "5.0.0", - "intl-messageformat": "^2.2.0", + "intl-messageformat": "^8.3.9", "js-yaml": "^3.13.1", "leaflet": "^1.4.0", "leaflet-draw": "^1.0.4", diff --git a/src/common/translations/localize.ts b/src/common/translations/localize.ts index 11a5246f01..bd864b0448 100644 --- a/src/common/translations/localize.ts +++ b/src/common/translations/localize.ts @@ -1,4 +1,4 @@ -import IntlMessageFormat from "intl-messageformat/src/main"; +import IntlMessageFormat from "intl-messageformat"; import { Resources } from "../../types"; export type LocalizeFunc = (key: string, ...args: any[]) => string; @@ -59,7 +59,7 @@ export const computeLocalize = ( let translatedMessage = cache._localizationCache[messageKey]; if (!translatedMessage) { - translatedMessage = new (IntlMessageFormat as any)( + translatedMessage = new IntlMessageFormat( translatedValue, language, formats diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts index f347ce34da..289a94d620 100644 --- a/src/panels/config/integrations/ha-config-integrations.ts +++ b/src/panels/config/integrations/ha-config-integrations.ts @@ -590,7 +590,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { title: this.hass!.localize( "ui.panel.config.integrations.ignore.confirm_delete_ignore_title", "name", - this.hass.localize(`component.${entry.domain}.config.title`) + this.hass.localize(`component.${entry.domain}.title`) ), text: this.hass!.localize( "ui.panel.config.integrations.ignore.confirm_delete_ignore" diff --git a/yarn.lock b/yarn.lock index 7600033c60..801c84d741 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1466,6 +1466,18 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@formatjs/intl-unified-numberformat@^3.3.5": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.5.tgz#b150c25eb56c1b09a03bf24fb5d1e394b945a27c" + integrity sha512-LdRs9OoqG8Ah6wKKAcaq9wfeZ0w+Icway63thbbOam5DLY9G3u44NReFYWAmVSU+MXOQ+VPATMB9RUXGZxBdig== + dependencies: + "@formatjs/intl-utils" "^2.2.4" + +"@formatjs/intl-utils@^2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.4.tgz#fe62a96799d1f7dbe621fd38a4bd2e5a6a16cb0e" + integrity sha512-83fsJywew0o9wQsW3VuEp33HRiFd0qbQDyFFnwZCwk59eLZ33CtKyJ5ofKMrU2KK6hk1zaIdzisrZeoNfmI3Tw== + "@gfx/zopfli@^1.0.9": version "1.0.11" resolved "https://registry.yarnpkg.com/@gfx/zopfli/-/zopfli-1.0.11.tgz#6ced06b4566a5feb0036fe6a1e0262ce6cb1d6c5" @@ -1920,15 +1932,6 @@ "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.26" "@polymer/polymer" "^3.0.0" -"@polymer/app-localize-behavior@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polymer/app-localize-behavior/-/app-localize-behavior-3.0.1.tgz#b787dc15c4399fdd006851cacb6107a9580edf06" - integrity sha512-0OZuUIMlfYvSJbB+clU+UaEuSDsvyu997xM3aRW33mGWijgUFMprWUQIP12RM8Ob/2i7WXJPn5ew3ir+rwTARg== - dependencies: - "@polymer/iron-ajax" "^3.0.0-pre.26" - "@polymer/polymer" "^3.0.0" - intl-messageformat "^2.2.0" - "@polymer/app-route@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@polymer/app-route/-/app-route-3.0.2.tgz#749096fb610fb15d27c7b68446406f30786cf93d" @@ -1968,13 +1971,6 @@ dependencies: "@polymer/polymer" "^3.0.0" -"@polymer/iron-ajax@^3.0.0-pre.26": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@polymer/iron-ajax/-/iron-ajax-3.0.1.tgz#831781be31ced011ac7243a46e34a775a4bb3133" - integrity sha512-7+TPEAfWsRdhj1Y8UeF1759ktpVu+c3sG16rJiUC3wF9+woQ9xI1zUm2d59i7Yc3aDEJrR/Q8Y262KlOvyGVNg== - dependencies: - "@polymer/polymer" "^3.0.0" - "@polymer/iron-autogrow-textarea@^3.0.0-pre.26", "@polymer/iron-autogrow-textarea@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@polymer/iron-autogrow-textarea/-/iron-autogrow-textarea-3.0.1.tgz#0205d9c5ca16f3afd505f41e9037989707d59dce" @@ -2551,6 +2547,11 @@ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a" integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA== +"@types/chai@^4.2.11": + version "4.2.11" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50" + integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw== + "@types/chalk@^0.4.30": version "0.4.31" resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-0.4.31.tgz#a31d74241a6b1edbb973cf36d97a2896834a51f9" @@ -8538,17 +8539,28 @@ interpret@1.2.0, interpret@^1.1.0, interpret@^1.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -intl-messageformat-parser@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075" - integrity sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU= - -intl-messageformat@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc" - integrity sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw= +intl-format-cache@^4.2.26: + version "4.2.26" + resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-4.2.26.tgz#ba5e2ee6cec25217f688b68ecdd58eec3703a827" + integrity sha512-RalEzK89R3rJrOo7vcGY8h1WLypF1ZRQQldIsrQM6FTEPixvHb+pAEhd2QkdUk972hFjAEBJR02GdHhaEw9v2g== dependencies: - intl-messageformat-parser "1.4.0" + "@types/chai" "^4.2.11" + chai "^4.2.0" + +intl-messageformat-parser@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-5.0.2.tgz#878c0d66459b366f4135a812007a873789875b95" + integrity sha512-7logOIMKQX4cWTAGdMSPdlzlGG2aGcpdTr/Laroi3/LTgXvYqMQ8fbC7DolygSEWUxbYrzDIuQsoQGJO6Kp8Gg== + dependencies: + "@formatjs/intl-unified-numberformat" "^3.3.5" + +intl-messageformat@^8.3.9: + version "8.3.9" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-8.3.9.tgz#fa57e6f5abdd4b5ad03dd767c965435bd38cbd78" + integrity sha512-WHIopaMiZ14UJ76d14FfqbeNE3knGJT7pJg6eJVxh1G5ziL656BqfQk6dYxPZ2VvoaY7wnT3dLlIXy1MTE0blw== + dependencies: + intl-format-cache "^4.2.26" + intl-messageformat-parser "^5.0.2" into-stream@^4.0.0: version "4.0.0"