Bug 1593188 - Port bug 1595471: More tweaks to engines.json. r=me
authorJorg K <jorgk@jorgk.com>
Tue, 12 Nov 2019 20:05:22 +0100
changeset 36622 4cc36294505950bdefcb86afab1b7bc31d0cc535
parent 36621 70edaf9ceae66944922bbe62746f2793c56eeca9
child 36623 edda2bec8db7c2f754c0d83a42067263c27bb111
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1593188, 1595471
Bug 1593188 - Port bug 1595471: More tweaks to engines.json. r=me
mail/components/search/extensions/engines.json
--- a/mail/components/search/extensions/engines.json
+++ b/mail/components/search/extensions/engines.json
@@ -1,94 +1,101 @@
 {
   "data": [
     {
       "orderHint": 1000,
       "webExtension": {
         "id": "google@search.mozilla.org",
         "version": "1.0"
       },
-      "searchUrlGetParams": {
-        "q": "{searchTerms}"
+      "params": {
+        "searchUrlGetParams": {
+          "q": "{searchTerms}"
+        }
       },
       "telemetryId": "google",
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes-if-no-other"
-      }],
-      "aliases": ["@google"]
+      }]
     },
     {
       "webExtension": {
         "id": "bing@search.mozilla.org",
         "version": "1.0"
       },
-      "searchUrlGetParams": {
-        "q": "{searchTerms}"
+      "params": {
+        "searchUrlGetParams": {
+          "q": "{searchTerms}"
+        }
       },
       "appliesTo": [{
         "included": {
           "locales": {
             "matches": [
               "ach", "af", "an", "ar", "ast", "az", "ca", "ca-valencia",
               "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",
               "wo", "xh", "zh-CN"
             ],
             "startsWith": ["bn", "en"]
           }
         }
       }, {
         "included": { "regions": ["default"] }
-      }],
-      "aliases": ["@bing"]
+      }]
     },
     {
       "webExtension": {
         "id": "baidu@search.mozilla.org",
         "version": "1.0"
       },
       "telemetryId": "baidu",
-      "searchUrlGetParams": {
-        "wd": "{searchTerms}",
-        "ie": "utf-8"
-      },
-      "suggestUrlGetParams": {
-        "wd": "{searchTerms}",
-        "ie": "utf-8",
-        "action": "opensearch"
+      "params": {
+        "searchUrlGetParams": {
+          "wd": "{searchTerms}",
+          "tn": "monline_7_dg",
+          "ie": "utf-8"
+        },
+        "suggestUrlGetParams": {
+          "wd": "{searchTerms}",
+          "tn": "monline_7_dg",
+          "ie": "utf-8",
+          "action": "opensearch"
+        }
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["zh-CN"] } }
       }, {
         "included": {
           "regions": ["cn"],
           "locales": { "matches": ["zh-CN"] }
         },
         "default": "yes"
-      }],
-      "aliases": ["@\u767E\u5EA6", "@baidu"]
+      }]
     },
     {
       "orderHint": 500,
       "webExtension": {
         "id": "amazondotcom@search.mozilla.org",
         "version": "1.1"
       },
       "telemetryId": "amazondotcom",
-      "suggestUrlGetParams": {
-        "field-keywords": "{searchTerms}",
-        "ie": "{inputEncoding}",
-        "mode": "blended",
-        "sourceid": "Mozilla-search"
+      "params": {
+        "searchUrlGetParams": {
+          "field-keywords": "{searchTerms}",
+          "ie": "{inputEncoding}",
+          "mode": "blended",
+          "sourceid": "Mozilla-search"
+        }
       },
       "appliesTo": [{
         "included": { "regions": ["default"] }
       }, {
         "included": {
           "locales": {
             "matches": [
               "ach", "af", "ar", "az", "bg", "cak", "en-US", "eo",
@@ -147,21 +154,23 @@
           }
         },
         "webExtension": {
           "id": "amazon@search.mozilla.org",
           "version": "1.1",
           "locales": ["france"]
         },
         "telemetryId": "amazon-france",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": {
           "regions": ["gb"],
           "locales": {
             "matches": [
               "ach", "af", "ar", "az", "bg", "cak", "en-US", "eo",
               "es-AR", "fa", "gn", "hy-AM", "ia", "is", "ka", "km",
@@ -171,35 +180,38 @@
           }
         },
         "webExtension": {
           "id": "amazon@search.mozilla.org",
           "version": "1.1",
           "locales": ["en-GB"]
         },
         "telemetryId": "amazon-en-GB",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
-      }],
-      "aliases": ["amazon"]
+      }]
     },
     {
       "orderHint": 500,
       "webExtension": {
         "id": "amazon@search.mozilla.org",
         "version": "1.1"
       },
-      "searchUrlGetParams": {
-        "field-keywords": "{searchTerms}",
-        "ie": "{inputEncoding}",
-        "mode": "blended"
+      "params": {
+        "searchUrlGetParams": {
+          "field-keywords": "{searchTerms}",
+          "ie": "{inputEncoding}",
+          "mode": "blended"
+        }
       },
       "appliesTo": [{
         "included": {
           "locales": { "matches": [
             "as", "bn", "bn-IN", "kn", "gu-IN", "mai", "ml", "mr",
             "or", "pa-IN", "ta", "te", "ur"
           ]}
         },
@@ -210,21 +222,23 @@
       }, {
         "included": {
           "locales": { "matches": ["br", "ff", "fr", "son", "wo"] }
         },
         "webExtension": {
           "locales": ["france"]
         },
         "telemetryId": "amazon-france",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": {
           "regions": ["ca"],
           "locales": { "matches": ["br", "ff", "fr", "son", "wo"] }
         },
         "webExtension": {
           "locales": ["ca"]
@@ -232,119 +246,123 @@
         "telemetryId": "amazon-ca"
       }, {
         "included": { "locales": { "matches": ["en-CA"] } },
         "webExtension": {
           "locales": ["ca"]
         },
         "telemetryId": "amazon-ca"
       }, {
-        "included": { "locales": { "matches": ["ja-JP-mac", "ja"] } },
+        "included": { "locales": { "matches": ["ja-JP-macos", "ja"] } },
         "webExtension": {
           "locales": ["jp"]
         },
         "telemetryId": "amazon-jp",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": { "locales": { "matches": ["it", "lij"] } },
         "webExtension": {
           "locales": ["it"]
         },
         "telemetryId": "amazon-it",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": { "locales": { "matches": ["de", "dsb", "hsb"] } },
         "webExtension": {
           "locales": ["de"]
         },
         "telemetryId": "amazon-de",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": {
           "locales": {
             "matches": [
               "cy", "da", "el", "en-GB", "eu", "ga-IE", "gd", "gl", "hr",
               "nb-NO", "nn-NO", "pt-PT", "sq", "sr"
             ]
           }
         },
         "webExtension": {
           "locales": ["en-GB"]
         },
         "telemetryId": "amazon-en-GB",
-        "searchUrlGetParams": {
-          "field-keywords": "{searchTerms}",
-          "ie": "{inputEncoding}",
-          "mode": "blended",
-          "sourceid":"Mozilla-search"
+        "params": {
+          "searchUrlGetParams": {
+            "field-keywords": "{searchTerms}",
+            "ie": "{inputEncoding}",
+            "mode": "blended",
+            "sourceid":"Mozilla-search"
+          }
         }
       }, {
         "included": {
           "regions": ["au"],
           "locales": {
             "matches": [
               "cy", "da", "el", "en-GB", "eu", "ga-IE", "gd", "gl", "hr",
               "nb-NO", "nn-NO", "pt-PT", "sq", "sr"
             ]
           }
         },
         "webExtension": {
           "locales": ["au"]
         },
         "telemetryId": "amazon-au"
-      }],
-      "aliases": ["amazon"]
+      }]
     },
     {
       "orderHint": 500,
       "webExtension": {
         "id": "amazondotcn@search.mozilla.org",
         "version": "1.0"
       },
       "telemetryId": "amazondotcn",
-      "suggestUrlGetParams": {
-        "keywords": "{searchTerms}",
-        "ix": "sunray",
-        "pageletid": "headsearch",
-        "searchType": "",
-        "Go.x": "0",
-        "Go.y": "0",
-        "bestSaleNum": "0"
+      "params": {
+        "searchUrlGetParams": {
+          "keywords": "{searchTerms}",
+          "ix": "sunray",
+          "pageletid": "headsearch",
+          "searchType": "",
+          "Go.x": "0",
+          "Go.y": "0",
+          "bestSaleNum": "0"
+        }
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["zh-CN"] } }
-      }],
-      "aliases": ["amazon"]
+      }]
     },
     {
       "orderHint": 500,
       "webExtension": {
         "id": "ddg@search.mozilla.org",
         "version": "1.0"
       },
-      "telemetryId": "ddg",
-      "appliesTo": [{
-        "included": { "everywhere": true }
-      }],
-      "aliases": ["@duckduckgo", "@ddg"]
+      "telemetryId": "ddg"
     },
     {
       "webExtension": {
         "id": "yandex@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "default": "yes",
@@ -384,18 +402,17 @@
         },
         "telemetryId": "yandex-ru"
       }, {
         "included": { "locales": { "matches": ["tr"] }},
         "webExtension": {
           "locales": ["tr"]
         },
         "telemetryId": "yandex-tr"
-      }],
-      "aliases": ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"]
+      }]
     },
     {
       "webExtension": {
         "id": "allaannonser-sv-SE@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sv-SE"]}}}]
     },
@@ -698,17 +715,17 @@
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["bs"]}}}]
     },
     {
       "webExtension": {
         "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": {
         "id": "osta-ee@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["et"]}}}]
     },
@@ -782,17 +799,17 @@
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["nb-NO", "nn-NO"]}}}]
     },
     {
       "webExtension": {
         "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": {
         "id": "readmoo@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["zh-TW"]}}}]
     },
@@ -832,17 +849,17 @@
       "appliesTo": [{
         "included": { "locales": { "matches": [
           "default", "en-US", "ach", "an", "bs", "ca", "ca-valencia",
           "crh", "en-CA", "ga-IE", "gn", "hr", "ia", "ka", "kk", "km",
           "lo", "lt", "mai",  "ms", "my", "ne-NP", "oc", "pt-BR",
           "sl", "tl", "tr", "ur", "uz", "wo"
         ]}}
       }, {
-        "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}},
+        "included": { "locales": { "matches": ["ja-JP-macos", "ja"]}},
         "webExtension": {
           "locales": ["ja"]
         }
       }]
     },
     {
       "webExtension": {
         "id": "tyda-sv-SE@search.mozilla.org",
@@ -881,24 +898,24 @@
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pl"]}}}]
     },
     {
       "webExtension": {
         "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": {
         "id": "zoznam-sk@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sk"]}}}]
     },