Taking changes from PR:1323 and merging into here (as requested)

adobecom · Sep 23, 2023 · df57736 · df57736
1 parent 9391cc6
commit df57736
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/libs/blocks/caas/utils.js b/libs/blocks/caas/utils.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 import { loadScript, loadStyle, getConfig as pageConfigHelper } from '../../utils/utils.js';
 import { fetchWithTimeout } from '../utils/utils.js';
+import { LOCALES } from '../../../tools/send-to-caas/send-utils.js';
 
 const URL_ENCODED_COMMA = '%2C';
 
@@ -261,10 +262,14 @@ const getFilterArray = async (state, country, lang, strs) => {
 
 export function getCountryAndLang({ autoCountryLang, country, language }) {
   if (autoCountryLang) {
-    const locale = pageConfigHelper()?.locale;
+    const prefix = pageConfigHelper()?.locale?.prefix?.replace('/', '') || '';
+    const locale = LOCALES[prefix]?.ietf || 'en-us';
+    /* eslint-disable-next-line prefer-const */
+    let [currLang, currCountry] = locale.split('-');
+
     return {
-      country: locale.region?.toLowerCase() || 'us',
-      language: locale.ietf?.toLowerCase() || 'en-us',
+      country: currCountry,
+      language: currLang,
     };
   }
   return {

diff --git a/test/blocks/caas/utils.test.js b/test/blocks/caas/utils.test.js
@@ -577,8 +577,8 @@ describe('getCountryAndLang', () => {
       autoCountryLang: true,
     });
     expect(expected).to.deep.eq({
-      country: 'be',
-      language: 'fr-be',
+      country: 'BE',
+      language: 'fr',
     });
   });
 
@@ -592,8 +592,8 @@ describe('getCountryAndLang', () => {
       autoCountryLang: true,
     });
     expect(expected).to.deep.eq({
-      country: 'us',
-      language: 'en-us',
+      country: 'US',
+      language: 'en',
     });
   });
 });
diff --git a/tools/send-to-caas/send-utils.js b/tools/send-to-caas/send-utils.js
@@ -9,7 +9,7 @@ const VALID_URL_RE = /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-
 const isKeyValPair = /(\s*\S+\s*:\s*\S+\s*)/;
 const isValidUrl = (u) => VALID_URL_RE.test(u);
 
-const LOCALES = {
+export const LOCALES = {
   // Americas
   ar: { ietf: 'es-AR' },
   br: { ietf: 'pt-BR' },