Bug 1593188 - Port bug 1592209: Remove engineName from the modern configuration. r=me
authorJorg K <jorgk@jorgk.com>
Tue, 05 Nov 2019 21:56:37 +0100
changeset 37433 8a5adb2c48205055097c71efdd3ea832632fc7cd
parent 37432 9cad8d5e022be5324b9b9512ab20e96b0a7d1c00
child 37434 20c8f5c7d6e5fa11f11753859ee053dcb36a28c8
push id396
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:11:57 +0000
reviewersme
bugs1593188, 1592209
Bug 1593188 - Port bug 1592209: Remove engineName from the modern configuration. r=me
mail/components/search/extensions/engines.json
--- a/mail/components/search/extensions/engines.json
+++ b/mail/components/search/extensions/engines.json
@@ -1,29 +1,27 @@
 {
   "data": [
     {
-      "engineName": "google",
       "orderHint": 1000,
       "webExtension": {
         "id": "google@search.mozilla.org",
         "version": "1.0"
       },
       "searchUrlGetParams": {
         "q": "{searchTerms}"
       },
       "telemetryId": "google",
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes-if-no-other"
       }],
       "aliases": ["@google"]
     },
     {
-      "engineName": "bing",
       "webExtension": {
         "id": "bing@search.mozilla.org",
         "version": "1.0"
       },
       "searchUrlGetParams": {
         "q": "{searchTerms}"
       },
       "appliesTo": [{
@@ -44,17 +42,16 @@
           }
         }
       }, {
         "included": { "regions": ["default"] }
       }],
       "aliases": ["@bing"]
     },
     {
-      "engineName": "baidu",
       "webExtension": {
         "id": "baidu@search.mozilla.org",
         "version": "1.0"
       },
       "telemetryId": "baidu",
       "searchUrlGetParams": {
         "wd": "{searchTerms}",
         "ie": "utf-8"
@@ -71,17 +68,16 @@
           "regions": ["cn"],
           "locales": { "matches": ["zh-CN"] }
         },
         "default": "yes"
       }],
       "aliases": ["@\u767E\u5EA6", "@baidu"]
     },
     {
-      "engineName": "amazon",
       "orderHint": 500,
       "webExtension": {
         "id": "amazondotcom@search.mozilla.org",
         "version": "1.1"
       },
       "telemetryId": "amazondotcom",
       "suggestUrlGetParams": {
         "field-keywords": "{searchTerms}",
@@ -185,17 +181,16 @@
           "ie": "{inputEncoding}",
           "mode": "blended",
           "sourceid":"Mozilla-search"
         }
       }],
       "aliases": ["amazon"]
     },
     {
-      "engineName": "Amazon",
       "orderHint": 500,
       "webExtension": {
         "id": "amazon@search.mozilla.org",
         "version": "1.1"
       },
       "searchUrlGetParams": {
         "field-keywords": "{searchTerms}",
         "ie": "{inputEncoding}",
@@ -309,17 +304,16 @@
         "webExtension": {
           "locales": ["au"]
         },
         "telemetryId": "amazon-au"
       }],
       "aliases": ["amazon"]
     },
     {
-      "engineName": "amazoncn",
       "orderHint": 500,
       "webExtension": {
         "id": "amazondotcn@search.mozilla.org",
         "version": "1.0"
       },
       "telemetryId": "amazondotcn",
       "suggestUrlGetParams": {
         "keywords": "{searchTerms}",
@@ -331,30 +325,28 @@
         "bestSaleNum": "0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["zh-CN"] } }
       }],
       "aliases": ["amazon"]
     },
     {
-      "engineName": "ddg",
       "orderHint": 500,
       "webExtension": {
         "id": "ddg@search.mozilla.org",
         "version": "1.0"
       },
       "telemetryId": "ddg",
       "appliesTo": [{
         "included": { "everywhere": true }
       }],
       "aliases": ["@duckduckgo", "@ddg"]
     },
     {
-      "engineName": "yandex",
       "webExtension": {
         "id": "yandex@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "default": "yes",
         "included": {
           "regions": ["ru", "tr", "by", "kz"],
@@ -396,75 +388,67 @@
         "webExtension": {
           "locales": ["tr"]
         },
         "telemetryId": "yandex-tr"
       }],
       "aliases": ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"]
     },
     {
-      "engineName": "allaannonser-sv-SE",
       "webExtension": {
         "id": "allaannonser-sv-SE@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sv-SE"]}}}]
     },
     {
-      "engineName": "allegro-pl",
       "webExtension": {
         "id": "allegro-pl@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pl"]}}}]
     },
     {
-      "engineName": "atlas-sk",
       "webExtension": {
         "id": "atlas-sk@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sk"]}}}]
     },
     {
-      "engineName": "azerdict",
       "webExtension": {
         "id": "azerdict@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["az"]}}}]
     },
     {
-      "engineName": "azet-sk",
       "webExtension": {
         "id": "azet-sk@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sk"]}}}]
     },
     {
-      "engineName": "bbc-alba",
       "webExtension": {
         "id": "bbc-alba@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["gd"]}}}]
     },
     {
-      "engineName": "bok-NO",
       "webExtension": {
         "id": "bok-NO@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": {
         "locales": { "matches": ["nb-NO", "nn-NO"]}
       }}]
     },
     {
-      "engineName": "bolcom",
       "webExtension": {
         "id": "bolcom@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["fy-NL"]}},
         "webExtension": {
           "locales": ["fy-NL"]
@@ -472,188 +456,166 @@
       }, {
         "included": { "locales": { "matches": ["nl"]}},
         "webExtension": {
           "locales": ["nl"]
         }
       }]
     },
     {
-      "engineName": "ceneji",
       "webExtension": {
         "id": "ceneji@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sl"]}}}]
     },
     {
-      "engineName": "chambers-en-GB",
       "webExtension": {
         "id": "chambers-en-GB@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["en-GB"]}}}]
     },
     {
-      "engineName": "coccoc",
       "webExtension": {
         "id": "coccoc@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["vi"]}}}]
     },
     {
-      "engineName": "daum-kr",
       "webExtension": {
         "id": "daum-kr@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ko"]}}}]
     },
     {
-      "engineName": "diec2",
       "webExtension": {
         "id": "diec2@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["ca", "ca-valencia"]}}}]
     },
     {
-      "engineName": "drae",
       "webExtension": {
         "id": "drae@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["es-AR", "es-CL", "es-ES"]}}
       }]
     },
     {
-      "engineName": "ecosia",
       "webExtension": {
         "id": "ecosia@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["de"]}}}]
     },
     {
-      "engineName": "eki-ee",
       "webExtension": {
         "id": "eki-ee@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["et"]}}}]
     },
     {
-      "engineName": "eudict",
       "webExtension": {
         "id": "eudict@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["hr"]}}}]
     },
     {
-      "engineName": "faclair-beag",
       "webExtension": {
         "id": "faclair-beag@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["gd"]}}}]
     },
     {
-      "engineName": "flip",
       "webExtension": {
         "id": "flip@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["kk"]}}}]
     },
     {
-      "engineName": "freelang",
       "webExtension": {
         "id": "freelang@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["br"]}}}]
     },
     {
-      "engineName": "gulesider-NO",
       "webExtension": {
         "id": "gulesider-NO@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["nn-NO", "nb-NO"]}}}]
     },
     {
-      "engineName": "heureka-cz",
       "webExtension": {
         "id": "heureka-cz@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["cs"]}}}]
     },
     {
-      "engineName": "hotline-ua",
       "webExtension": {
         "id": "hotline-ua@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["uk"]}}}]
     },
     {
-      "engineName": "kannadastore",
       "webExtension": {
         "id": "kannadastore@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["kn"]}}}]
     },
     {
-      "engineName": "leo_ende_de",
       "webExtension": {
         "id": "leo_ende_de@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["de", "dsb", "hsb" , "rm"]}}}]
     },
     {
-      "engineName": "list-am",
       "webExtension": {
         "id": "list-am@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["hy-AM"]}}}]
     },
     {
-      "engineName": "longdo",
       "webExtension": {
         "id": "longdo@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["th"]}}}]
     },
     {
-      "engineName": "mailru",
       "webExtension": {
         "id": "mailru@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ru"]}}}]
     },
     {
-      "engineName": "mapy-cz",
       "webExtension": {
         "id": "mapy-cz@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["cs"]}}}]
     },
     {
-      "engineName": "marktplaats",
       "webExtension": {
         "id": "marktplaats@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["fy-NL"]}},
         "webExtension": {
           "locales": ["fy-NL"]
@@ -661,17 +623,16 @@
       }, {
         "included": { "locales": { "matches": ["nl"]}},
         "webExtension": {
           "locales": ["nl"]
         }
       }]
     },
     {
-      "engineName": "mercadolibre",
       "webExtension": {
         "id": "mercadolibre@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["es-AR"]}},
         "webExtension": {
           "locales": ["ar"]
@@ -684,217 +645,191 @@
       }, {
         "included": { "locales": { "matches": ["es-MX"]}},
         "webExtension": {
           "locales": ["mx"]
         }
       }]
     },
     {
-      "engineName": "mercadolivre",
       "webExtension": {
         "id": "mercadolivre@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pt-BR"]}}}]
     },
     {
-      "engineName": "morfix-dic",
       "webExtension": {
         "id": "morfix-dic@search.mozilla.org",
         "version": "1.1"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["he"]}}}]
     },
     {
-      "engineName": "najdi-si",
       "webExtension": {
         "id": "najdi-si@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sl"]}}}]
     },
     {
-      "engineName": "naver-kr",
       "webExtension": {
         "id": "naver-kr@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ko"]}}}]
     },
     {
-      "engineName": "neti-ee",
       "webExtension": {
         "id": "neti-ee@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["et"]}}}]
     },
     {
-      "engineName": "odpiralni",
       "webExtension": {
         "id": "odpiralni@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sl"]}}}]
     },
     {
-      "engineName": "olx",
       "webExtension": {
         "id": "olx@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["bs"]}}}]
     },
     {
-      "engineName": "oshiete-goo",
       "webExtension": {
         "id": "oshiete-goo@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "jp"]}}}]
     },
     {
-      "engineName": "osta-ee",
       "webExtension": {
         "id": "osta-ee@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["et"]}}}]
     },
     {
-      "engineName": "ozonru",
       "webExtension": {
         "id": "ozonru@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ru"]}}}]
     },
     {
-      "engineName": "palasprint",
       "webExtension": {
         "id": "palasprint@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["cy"]}}}]
     },
     {
-      "engineName": "pazaruvaj",
       "webExtension": {
         "id": "pazaruvaj@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["bg"]}}}]
     },
     {
-      "engineName": "pogodak",
       "webExtension": {
         "id": "pogodak@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sr"]}}}]
     },
     {
-      "engineName": "priberam",
       "webExtension": {
         "id": "priberam@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pt-PT"]}}}]
     },
     {
-      "engineName": "priceru",
       "webExtension": {
         "id": "priceru@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ru"]}}}]
     },
     {
-      "engineName": "prisjakt-sv-SE",
       "webExtension": {
         "id": "prisjakt-sv-SE@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sv-SE"]}}}]
     },
     {
-      "engineName": "pwn-pl",
       "webExtension": {
         "id": "pwn-pl@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pl"]}}}]
     },
     {
-      "engineName": "qwant",
       "webExtension": {
         "id": "qwant@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["fr"]}}}]
     },
     {
-      "engineName": "qxl-NO",
       "webExtension": {
         "id": "qxl-NO@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["nb-NO", "nn-NO"]}}}]
     },
     {
-      "engineName": "rakuten",
       "webExtension": {
         "id": "rakuten@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "jp"]}}}]
     },
     {
-      "engineName": "readmoo",
       "webExtension": {
         "id": "readmoo@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["zh-TW"]}}}]
     },
     {
-      "engineName": "salidzinilv",
       "webExtension": {
         "id": "salidzinilv@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ltg", "lv"]}}}]
     },
     {
-      "engineName": "seznam-cz",
       "webExtension": {
         "id": "seznam-cz@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["cs"]}}}]
     },
     {
-      "engineName": "sslv",
       "webExtension": {
         "id": "sslv@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ltg", "lv"]}}}]
     },
     {
-      "engineName": "tearma",
       "webExtension": {
         "id": "tearma@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ga-IE"]}}}]
     },
     {
-      "engineName": "twitter",
       "webExtension": {
         "id": "twitter@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": [
           "default", "en-US", "ach", "an", "bs", "ca", "ca-valencia",
           "crh", "en-CA", "ga-IE", "gn", "hr", "ia", "ka", "kk", "km",
@@ -904,33 +839,30 @@
       }, {
         "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}},
         "webExtension": {
           "locales": ["ja"]
         }
       }]
     },
     {
-      "engineName": "tyda-sv-SE",
       "webExtension": {
         "id": "tyda-sv-SE@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sv-SE"]}}}]
     },
     {
-      "engineName": "vatera",
       "webExtension": {
         "id": "vatera@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["hu"]}}}]
     },
     {
-      "engineName": "wiktionary",
       "webExtension": {
         "id": "wiktionary@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["te"]}},
         "webExtension": {
           "locales": ["te"]
@@ -938,49 +870,44 @@
       }, {
         "included": { "locales": { "matches": ["oc"]}},
         "webExtension": {
           "locales": ["oc"]
         }
       }]
     },
     {
-      "engineName": "wolnelektury-pl",
       "webExtension": {
         "id": "wolnelektury-pl@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["pl"]}}}]
     },
     {
-      "engineName": "yahoo-jp",
       "webExtension": {
         "id": "yahoo-jp@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}}}]
     },
     {
-      "engineName": "yahoo-jp-auctions",
       "webExtension": {
         "id": "yahoo-jp-auctions@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}}}]
     },
     {
-      "engineName": "zoznam-sk",
       "webExtension": {
         "id": "zoznam-sk@search.mozilla.org",
         "version": "1.2"
       },
       "appliesTo": [{ "included": { "locales": { "matches": ["sk"]}}}]
     },
     {
-      "engineName": "wikipedia",
       "webExtension": {
         "id": "wikipedia@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [ {
         "included": { "everywhere": true }
       }, {
         "included": { "locales": { "matches": [