MWPW-136766, MWPW-136143: Milo not supporting sending to CaaS all loc…

…ales & Autodetect not working (adobecom#1324) * Adds all missing locales * Update to more correct locales after thorough testing * Missing one locale * More updates * Removing unused mena fields * Fixing locale issues with send to caas button * Taking changes from PR:1323 and merging into here (as requested)
suhjainadobe · Oct 21, 2023 · 73ff9ed · 73ff9ed
1 parent 9d6ffd7
commit 73ff9ed
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 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';
 export const fgHeaderName = 'X-Adobe-Floodgate';
@@ -273,10 +274,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,18 +9,24 @@ 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' },
   ca: { ietf: 'en-CA' },
   ca_fr: { ietf: 'fr-CA' },
   cl: { ietf: 'es-CL' },
   co: { ietf: 'es-CO' },
+  cr: { ietf: 'es-CR' },
+  ec: { ietf: 'es-EC' },
+  el: { ietf: 'es-EL' },
+  gt: { ietf: 'es-GT' },
   la: { ietf: 'es-LA' },
   mx: { ietf: 'es-MX' },
   pe: { ietf: 'es-PE' },
+  pr: { ietf: 'es-PR' },
   '': { ietf: 'en-US' },
+  langstore: { ietf: 'en-US' },
   // EMEA
   africa: { ietf: 'en-africa' },
   be_fr: { ietf: 'fr-BE' },
@@ -30,27 +36,34 @@ const LOCALES = {
   dk: { ietf: 'da-DK' },
   de: { ietf: 'de-DE' },
   ee: { ietf: 'et-EE' },
+  eg_ar: { ietf: 'ar-EG' },
+  eg_en: { ietf: 'en-GB' },
   es: { ietf: 'es-ES' },
   fr: { ietf: 'fr-FR' },
   gr_en: { ietf: 'en-GR' },
+  gr_el: { ietf: 'el-GR' },
   ie: { ietf: 'en-IE' },
   il_en: { ietf: 'en-IL' },
+  il_he: { ietf: 'he-il' },
   it: { ietf: 'it-IT' },
+  kw_ar: { ietf: 'ar-KW' },
+  kw_en: { ietf: 'en-GB' },
   lv: { ietf: 'lv-LV' },
   lt: { ietf: 'lt-LT' },
   lu_de: { ietf: 'de-LU' },
   lu_en: { ietf: 'en-LU' },
   lu_fr: { ietf: 'fr-LU' },
   hu: { ietf: 'hu-HU' },
   mt: { ietf: 'en-MT' },
-  mena: { ietf: 'en-mena' },
   mena_en: { ietf: 'en-mena' },
   mena_ar: { ietf: 'ar-mena' },
-  mena_fr: { ietf: 'fr-mena' },
+  ng: { ietf: 'en-NG' },
   nl: { ietf: 'nl-NL' },
   no: { ietf: 'no-NO' },
   pl: { ietf: 'pl-PL' },
   pt: { ietf: 'pt-PT' },
+  qa_ar: { ietf: 'ar-QA' },
+  qa_en: { ietf: 'en-GB' },
   ro: { ietf: 'ro-RO' },
   sa_en: { ietf: 'en-sa' },
   ch_fr: { ietf: 'fr-CH' },
@@ -68,9 +81,9 @@ const LOCALES = {
   bg: { ietf: 'bg-BG' },
   ru: { ietf: 'ru-RU' },
   ua: { ietf: 'uk-UA' },
-  il_he: { ietf: 'he-il' },
   ae_ar: { ietf: 'ar-ae' },
   sa_ar: { ietf: 'ar-sa' },
+  za: { ietf: 'en-ZA' },
   // Asia Pacific
   au: { ietf: 'en-AU' },
   hk_en: { ietf: 'en-HK' },
@@ -366,8 +379,7 @@ const getBulkPublishLangAttr = async (options) => {
 const getCountryAndLang = async (options) => {
   const langStr = window.location.pathname === '/tools/send-to-caas/bulkpublisher.html'
     ? await getBulkPublishLangAttr(options)
-    : document.documentElement.lang;
-
+    : (LOCALES[window.location.pathname.split('/')[1]] || LOCALES['']).ietf;
   const langAttr = langStr?.toLowerCase().split('-') || [];
 
   const [lang = 'en', country = 'us'] = langAttr;