Bug 1549821 - Fix a couple of issues with the Amazon search engine urls. r=mkaply
authorMark Banner <standard8@mozilla.com>
Wed, 08 May 2019 11:50:55 +0000
changeset 534928 72f13244bf42d994d1a559457c6081b938f8ccb2
parent 534927 b5344f8392c0bae8dd62280f3b608b1f907f6568
child 534938 fd9b8188501938a9306105a01db5beeefeab1a19
child 534939 ebcb2c853b9ce80debb2a093c3855a16a2f15492
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkaply
bugs1549821
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549821 - Fix a couple of issues with the Amazon search engine urls. r=mkaply Differential Revision: https://phabricator.services.mozilla.com/D30256
browser/components/search/extensions/amazon/_locales/br/messages.json
browser/components/search/extensions/amazon/_locales/de/messages.json
browser/components/search/extensions/amazon/manifest.json
browser/components/search/extensions/amazondotcom/_locales/de/messages.json
browser/components/search/extensions/amazondotcom/manifest.json
browser/components/search/extensions/list.json
deleted file mode 100644
--- a/browser/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 browser/components/search/extensions/amazondotcom/_locales/de/messages.json
rename to browser/components/search/extensions/amazon/_locales/de/messages.json
--- a/browser/components/search/extensions/amazon/manifest.json
+++ b/browser/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": {
@@ -19,9 +19,9 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "name": "__MSG_extensionName__",
       "search_url": "__MSG_searchUrl__",
       "search_form": "__MSG_searchForm__",
       "search_url_get_params": "__MSG_searchUrlGetParams__"
     }
   }
-}
\ No newline at end of file
+}
--- a/browser/components/search/extensions/amazondotcom/manifest.json
+++ b/browser/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": {
@@ -20,9 +20,9 @@
     "search_provider": {
       "name": "__MSG_extensionName__",
       "search_url": "__MSG_searchUrl__",
       "search_form": "__MSG_searchForm__",
       "suggest_url": "__MSG_suggestUrl__",
       "search_url_get_params": "__MSG_searchUrlGetParams__"
     }
   }
-}
\ No newline at end of file
+}
--- a/browser/components/search/extensions/list.json
+++ b/browser/components/search/extensions/list.json
@@ -209,24 +209,24 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
         ]
       }
     },
     "de": {
       "default": {
         "visibleDefaultEngines": [
-          "google-b-d", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
+          "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
         ]
       }
     },
     "dsb": {
       "default": {
         "visibleDefaultEngines": [
-          "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
+          "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
         ]
       }
     },
     "el": {
       "default": {
         "visibleDefaultEngines": [
           "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
         ]
@@ -391,17 +391,17 @@
         "visibleDefaultEngines": [
           "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
         ]
       }
     },
     "hsb": {
       "default": {
         "visibleDefaultEngines": [
-          "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
+          "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
         ]
       }
     },
     "hu": {
       "default": {
         "visibleDefaultEngines": [
           "google-b-d", "ddg", "vatera", "wikipedia-hu"
         ]