Bug 1552010 - Follow Mozilla search engine movements: Port bug 1535288 and bug 1549821. r=me
authorJorg K <jorgk@jorgk.com>
Wed, 15 May 2019 22:07:16 +0200
changeset 26615 879215e9fcc37537ffcd17059ece601c85f8baaf
parent 26614 55b2fbbb1f53c0dd798a3414fe80bc2c0a0b5e4f
child 26616 13360f79c2b5d776dc9e9736fcd0e915edb5fcdf
push id15920
push usermozilla@jorgk.com
push dateWed, 15 May 2019 20:14:27 +0000
treeherdercomm-central@879215e9fcc3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1552010, 1535288, 1549821
Bug 1552010 - Follow Mozilla search engine movements: Port bug 1535288 and bug 1549821. r=me Bug 1535288 - Set up productization for Bengali (bn) Bug 1549821 - Fix a couple of issues with the Amazon search engine urls.
mail/components/search/extensions/amazon/_locales/br/messages.json
mail/components/search/extensions/amazon/_locales/de/messages.json
mail/components/search/extensions/amazon/manifest.json
mail/components/search/extensions/amazondotcom/_locales/de/messages.json
mail/components/search/extensions/amazondotcom/manifest.json
mail/components/search/extensions/list.json
deleted file mode 100644
--- a/mail/components/search/extensions/amazon/_locales/br/messages.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extensionName": {
-    "message": "Amazon.com.br"
-  },
-  "extensionDescription": {
-    "message": "Amazon.com.br Search"
-  },
-  "searchUrl": {
-    "message": "https://www.amazon.com.br/exec/obidos/external-search/"
-  },
-  "searchForm": {
-    "message": "https://www.amazon.com.br/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
-  },
-  "searchUrlGetParams": {
-    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
-  }
-}
\ No newline at end of file
rename from mail/components/search/extensions/amazondotcom/_locales/de/messages.json
rename to mail/components/search/extensions/amazon/_locales/de/messages.json
--- a/mail/components/search/extensions/amazon/manifest.json
+++ b/mail/components/search/extensions/amazon/manifest.json
@@ -1,13 +1,13 @@
 {
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
   "manifest_version": 2,
-  "version": "1.0",
+  "version": "1.1",
   "applications": {
     "gecko": {
       "id": "amazon@search.mozilla.org"
     }
   },
   "hidden": true,
   "default_locale": "au",
   "icons": {
--- a/mail/components/search/extensions/amazondotcom/manifest.json
+++ b/mail/components/search/extensions/amazondotcom/manifest.json
@@ -1,13 +1,13 @@
 {
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
   "manifest_version": 2,
-  "version": "1.0",
+  "version": "1.1",
   "applications": {
     "gecko": {
       "id": "amazondotcom@search.mozilla.org"
     }
   },
   "hidden": true,
   "default_locale": "en",
   "icons": {
--- a/mail/components/search/extensions/list.json
+++ b/mail/components/search/extensions/list.json
@@ -105,16 +105,23 @@
     },
     "bg": {
       "default": {
         "visibleDefaultEngines": [
           "google", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg"
         ]
       }
     },
+    "bn": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google", "amazon-in", "bing", "ddg", "wikipedia-bn"
+        ]
+      }
+    },
     "bn-BD": {
       "default": {
         "visibleDefaultEngines": [
           "google", "bing", "ddg", "wikipedia-bn"
         ]
       }
     },
     "bn-IN": {
@@ -179,24 +186,24 @@
         "visibleDefaultEngines": [
           "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
         ]
       }
     },
     "de": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "amazondotcom-de", "bing", "ddg", "ecosia", "leo_ende_de", "wikipedia-de"
+          "google", "amazon-de", "bing", "ddg", "ecosia", "leo_ende_de", "wikipedia-de"
         ]
       }
     },
     "dsb": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-dsb"
+          "google", "bing", "amazon-de", "ddg", "leo_ende_de", "wikipedia-dsb"
         ]
       }
     },
     "el": {
       "default": {
         "visibleDefaultEngines": [
           "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
         ]
@@ -376,17 +383,17 @@
         "visibleDefaultEngines": [
           "google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
         ]
       }
     },
     "hsb": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-hsb"
+          "google", "bing", "amazon-de", "ddg", "leo_ende_de", "wikipedia-hsb"
         ]
       }
     },
     "hu": {
       "default": {
         "visibleDefaultEngines": [
           "google", "ddg", "vatera", "wikipedia-hu"
         ]