Remove spurious feature tests for Intl

home-assistant · May 28, 2024 · ce09949 · ce09949
1 parent 362015f
commit ce09949
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 32 deletions.
diff --git a/src/common/language/format_language.ts b/src/common/language/format_language.ts
@@ -12,11 +12,10 @@ export const formatLanguageCode = (
   }
 };
 
-const formatLanguageCodeMem = memoizeOne((locale: FrontendLocaleData) =>
-  Intl && "DisplayNames" in Intl
-    ? new Intl.DisplayNames(locale.language, {
-        type: "language",
-        fallback: "code",
-      })
-    : undefined
+const formatLanguageCodeMem = memoizeOne(
+  (locale: FrontendLocaleData) =>
+    new Intl.DisplayNames(locale.language, {
+      type: "language",
+      fallback: "code",
+    })
 );
diff --git a/src/common/number/format_number.ts b/src/common/number/format_number.ts
@@ -63,8 +63,7 @@ export const formatNumber = (
 
   if (
     localeOptions?.number_format !== NumberFormat.none &&
-    !Number.isNaN(Number(num)) &&
-    Intl
+    !Number.isNaN(Number(num))
   ) {
     try {
       return new Intl.NumberFormat(
@@ -85,8 +84,7 @@ export const formatNumber = (
   if (
     !Number.isNaN(Number(num)) &&
     num !== "" &&
-    localeOptions?.number_format === NumberFormat.none &&
-    Intl
+    localeOptions?.number_format === NumberFormat.none
   ) {
     // If NumberFormat is none, use en-US format without grouping.
     return new Intl.NumberFormat(

diff --git a/src/components/ha-country-picker.ts b/src/components/ha-country-picker.ts
@@ -281,14 +281,10 @@ export class HaCountryPicker extends LitElement {
   private _getOptions = memoizeOne(
     (language?: string, countries?: string[]) => {
       let options: { label: string; value: string }[] = [];
-      const countryDisplayNames =
-        Intl && "DisplayNames" in Intl
-          ? new Intl.DisplayNames(language, {
-              type: "region",
-              fallback: "code",
-            })
-          : undefined;
-
+      const countryDisplayNames = new Intl.DisplayNames(language, {
+        type: "region",
+        fallback: "code",
+      });
       if (countries) {
         options = countries.map((country) => ({
           value: country,

diff --git a/src/components/ha-currency-picker.ts b/src/components/ha-currency-picker.ts
@@ -169,12 +169,9 @@ const CURRENCIES = [
 ];
 
 const curSymbol = (currency: string, locale?: string) =>
-  Intl && "NumberFormat" in Intl
-    ? new Intl.NumberFormat(locale, { style: "currency", currency })
-        .formatToParts(1)
-        .find((x) => x.type === "currency")?.value
-    : currency;
-
+  new Intl.NumberFormat(locale, { style: "currency", currency })
+    .formatToParts(1)
+    .find((x) => x.type === "currency")?.value;
 @customElement("ha-currency-picker")
 export class HaCurrencyPicker extends LitElement {
   @property() public language = "en";
@@ -188,13 +185,10 @@ export class HaCurrencyPicker extends LitElement {
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
   private _getOptions = memoizeOne((language?: string) => {
-    const currencyDisplayNames =
-      Intl && "DisplayNames" in Intl
-        ? new Intl.DisplayNames(language, {
-            type: "currency",
-            fallback: "code",
-          })
-        : undefined;
+    const currencyDisplayNames = new Intl.DisplayNames(language, {
+      type: "currency",
+      fallback: "code",
+    });
     const options = CURRENCIES.map((currency) => ({
       value: currency,
       label: `${