Don't always duplicate default locale in decentLocaleMatch

lblod · Apr 29, 2024 · 7538e80 · 7538e80
1 parent 33b0b76
commit 7538e80
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.changeset/chilled-cups-cheat.md b/.changeset/chilled-cups-cheat.md
@@ -0,0 +1,5 @@
+---
+"frontend-gelinkt-notuleren": patch
+---
+
+Remove duplication of supported locales passed to ember-intl
diff --git a/app/utils/intl.js b/app/utils/intl.js
@@ -34,22 +34,18 @@ export function decentLocaleMatch(
     matchUserLocaleToSupportedLocale(userLocale, supportedLocales),
   );
 
+  const lowerCaseDefaultLocale = defaultLocale.toLowerCase();
+
   const deduplicatedSupportedLocales = new Set([
-    ...supportedLocalesThatUserPrefers.map(
-      (locale) => locale && locale.toLowerCase(),
-    ),
-    defaultLocale.toLowerCase(),
+    ...supportedLocalesThatUserPrefers
+      .map((locale) => locale && locale.toLowerCase())
+      .filter((locale) => typeof locale === 'string'),
+    lowerCaseDefaultLocale,
   ]);
 
-  const definedSupportedLocales = [...deduplicatedSupportedLocales].filter(
-    (locale) => typeof locale === 'string',
-  );
-
-  const lowerCaseDefaultLocale = defaultLocale.toLowerCase();
-
-  if (definedSupportedLocales.length < 1) {
+  if (deduplicatedSupportedLocales.size < 1) {
     return [lowerCaseDefaultLocale];
   }
 
-  return [...definedSupportedLocales, lowerCaseDefaultLocale];
+  return [...deduplicatedSupportedLocales];
 }