MWPW-131707 Get correct region for caas autolang (#991)

adobecom · Jul 26, 2023 · b5658ae · b5658ae
1 parent 99f2b38
commit b5658ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/libs/blocks/caas/utils.js b/libs/blocks/caas/utils.js
@@ -254,11 +254,10 @@ const getFilterArray = async (state, country, lang) => {
 
 export function getCountryAndLang({ autoCountryLang, country, language }) {
   if (autoCountryLang) {
-    const htmlLang = pageConfigHelper()?.locale?.ietf?.toLowerCase() || 'en-us';
-    const [lang, cntry] = htmlLang.split('-');
+    const locale = pageConfigHelper()?.locale;
     return {
-      country: cntry,
-      language: lang,
+      country: locale.region?.toLowerCase() || 'us',
+      language: locale.ietf?.toLowerCase() || 'en-us',
     };
   }
   return {

diff --git a/libs/utils/utils.js b/libs/utils/utils.js
@@ -145,7 +145,9 @@ export function getLocale(locales, pathname = window.location.pathname) {
     locale.prefix = `/${localeString}/${split[2]}`;
     return locale;
   }
-  locale.prefix = locale.ietf === 'en-US' ? '' : `/${localeString}`;
+  const isUS = locale.ietf === 'en-US';
+  locale.prefix = isUS ? '' : `/${localeString}`;
+  locale.region = isUS ? 'us' : localeString.split('_')[0];
   return locale;
 }
 

diff --git a/test/blocks/caas/utils.test.js b/test/blocks/caas/utils.test.js
@@ -565,7 +565,7 @@ describe('getCountryAndLang', () => {
     });
     expect(expected).to.deep.eq({
       country: 'be',
-      language: 'fr',
+      language: 'fr-be',
     });
   });
 
@@ -580,7 +580,7 @@ describe('getCountryAndLang', () => {
     });
     expect(expected).to.deep.eq({
       country: 'us',
-      language: 'en',
+      language: 'en-us',
     });
   });
 });