Bug 1595471 - Correct ja-JP-macos references in engines.json for the modern configuration. r=mikedeboer

Differential Revision: https://phabricator.services.mozilla.com/D52539

--HG--
extra : moz-landing-system : lando

browser/components/search/extensions/engines.json

@@ -150,7 +150,7 @@
               "cak", "da", "de", "dsb", "el", "eo", "es-CL", "es-ES",
               "es-MX", "eu", "fa", "ff", "fi", "fr", "fy-NL", "gn",
               "gu-IN", "hi-IN", "hr", "hsb", "ia", "is", "it",
-              "ja-JP-mac", "ja", "ka", "kab", "km", "kn", "lij", "lo",
+              "ja-JP-macos", "ja", "ka", "kab", "km", "kn", "lij", "lo",
               "lt", "mai", "mk", "ml", "ms", "my", "nb-NO", "ne-NP", "nl",
               "nn-NO", "oc", "or", "pa-IN", "pt-BR", "rm", "ro", "son",
               "sq", "sr", "sv-SE", "th", "tl", "trs", "uk", "ur", "uz",
@@ -370,7 +370,7 @@
         },
         "telemetryId": "amazon-ca"
       }, {
-        "included": { "locales": { "matches": ["ja-JP-mac", "ja"] } },
+        "included": { "locales": { "matches": ["ja-JP-macos", "ja"] } },
         "webExtension": {
           "locales": ["jp"]
         },
@@ -1237,7 +1237,7 @@
         "id": "oshiete-goo@search.mozilla.org",
         "version": "1.0"
       },
-      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "jp"]}}}]
+      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-macos", "jp"]}}}]
     },
     {
       "webExtension": {
@@ -1321,7 +1321,7 @@
         "id": "rakuten@search.mozilla.org",
         "version": "1.2"
       },
-      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "jp"]}}}]
+      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-macos", "jp"]}}}]
     },
     {
       "webExtension": {
@@ -1371,7 +1371,7 @@
           "sl", "tl", "tr", "ur", "uz", "wo"
         ]}}
       }, {
-        "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}},
+        "included": { "locales": { "matches": ["ja-JP-macos", "ja"]}},
         "webExtension": {
           "locales": ["ja"]
         }
@@ -1420,14 +1420,14 @@
         "id": "yahoo-jp@search.mozilla.org",
         "version": "1.0"
       },
-      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}}}]
+      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-macos", "ja"]}}}]
     },
     {
       "webExtension": {
         "id": "yahoo-jp-auctions@search.mozilla.org",
         "version": "1.2"
       },
-      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}}}]
+      "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-macos", "ja"]}}}]
     },
     {
       "webExtension": {

toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js

@@ -237,7 +237,12 @@ class SearchConfigTest {
     });
     // "en-US" is not in all-locales as it is the default locale
     // add it manually to ensure it is tested.
-    return [...data.split("\n").filter(e => e != ""), "en-US"];
+    let locales = [...data.split("\n").filter(e => e != ""), "en-US"];
+    // BCP47 requires all variants are 5-8 characters long. Our
+    // build sytem uses the short `mac` variant, this is invalid, and inside
+    // the app we turn it into `ja-JP-macos`
+    locales = locales.map(l => (l == "ja-JP-mac" ? "ja-JP-macos" : l));
+    return locales;
   }
 
   /**

toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js

@@ -50,7 +50,7 @@ const test = new SearchConfigTest({
             "ia",
             "is",
             "it",
-            "ja-JP-mac",
+            "ja-JP-macos",
             "ja",
             "ka",
             "km",

toolkit/components/search/tests/xpcshell/searchconfigs/test_bing.js

@@ -51,7 +51,7 @@ const test = new SearchConfigTest({
             "ia",
             "is",
             "it",
-            "ja-JP-mac",
+            "ja-JP-macos",
             "ja",
             "ka",
             "kab",