nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1861662 - Update Amazon search engines. r=Standard8

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D192269
This commit is contained in:
Mike Kaply 2023-11-01 20:12:28 +00:00
parent 06ccb24c32
commit 99a9eed20c
21 changed files with 57 additions and 150 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
browser/components/search/extensions/amazon/_locales/au/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.com.au Search" "message": "Amazon.com.au Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.com.au/exec/obidos/external-search/" "message": "https://www.amazon.com.au/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.com.au/exec/obidos/external-search/" "message": "https://www.amazon.com.au/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.com.au/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=111172"
} }
} }

12
browser/components/search/extensions/amazon/_locales/ca/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.ca Search" "message": "Amazon.ca Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.ca/exec/obidos/external-search/" "message": "https://www.amazon.ca/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.ca/exec/obidos/external-search/" "message": "https://www.amazon.ca/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillacanada-20&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.ca/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=7"
} }
} }

10
browser/components/search/extensions/amazon/_locales/de/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.de Suche" "message": "Amazon.de Suche"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.de/exec/obidos/external-search/" "message": "https://www.amazon.de/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.de/" "message": "https://www.amazon.de/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-de-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.de/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=4"
} }
} }

10
browser/components/search/extensions/amazon/_locales/en-GB/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.co.uk Search" "message": "Amazon.co.uk Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.co.uk/exec/obidos/external-search/" "message": "https://www.amazon.co.uk/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.co.uk/" "message": "https://www.amazon.co.uk/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-uk-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.co.uk/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=3"
} }
} }

10
browser/components/search/extensions/amazon/_locales/france/messages.json
View file

@ -6,18 +6,12 @@
"message": "Recherche Amazon.fr" "message": "Recherche Amazon.fr"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.fr/exec/obidos/external-search/" "message": "https://www.amazon.fr/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.fr/" "message": "https://www.amazon.fr/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-fr-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.fr/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=5"
} }
} }

10
browser/components/search/extensions/amazon/_locales/in/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.in Search" "message": "Amazon.in Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.in/exec/obidos/external-search/" "message": "https://www.amazon.in/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.in/" "message": "https://www.amazon.in/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.in/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=44571"
} }
} }

10
browser/components/search/extensions/amazon/_locales/it/messages.json
View file

@ -6,18 +6,12 @@
"message": "Ricerca Amazon.it" "message": "Ricerca Amazon.it"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.it/exec/obidos/external-search/" "message": "https://www.amazon.it/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.it/" "message": "https://www.amazon.it/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefoxit-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.it/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=35691"
} }
} }

10
browser/components/search/extensions/amazon/_locales/nl/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.nl Search" "message": "Amazon.nl Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.nl/gp/search" "message": "https://www.amazon.nl/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.nl/" "message": "https://www.amazon.nl/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "ie={inputEncoding}&tag=mozillanether-21&index=aps&keywords={searchTerms}" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.nl/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=328451"
} }
} }

10
browser/components/search/extensions/amazon/_locales/spain/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.es" "message": "Amazon.es"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.es/exec/obidos/external-search/" "message": "https://www.amazon.es/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.es/" "message": "https://www.amazon.es/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillaspain-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.es/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=44551"
} }
} }

10
browser/components/search/extensions/amazon/_locales/sweden/messages.json
View file

@ -6,18 +6,12 @@
"message": "Amazon.se" "message": "Amazon.se"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.se/exec/obidos/external-search/" "message": "https://www.amazon.se/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.se/" "message": "https://www.amazon.se/"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillasweede-21&sourceid=Mozilla-search" "message": "k={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.se/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=704403121"
} }
} }

6
browser/components/search/extensions/amazon/manifest.json
View file

@ -2,7 +2,7 @@
"name": "__MSG_extensionName__", "name": "__MSG_extensionName__",
"description": "__MSG_extensionDescription__", "description": "__MSG_extensionDescription__",
"manifest_version": 2, "manifest_version": 2,
"version": "1.12", "version": "1.13",
"browser_specific_settings": { "browser_specific_settings": {
"gecko": { "gecko": {
"id": "amazon@search.mozilla.org" "id": "amazon@search.mozilla.org"
@ -20,9 +20,7 @@
"name": "__MSG_extensionName__", "name": "__MSG_extensionName__",
"search_url": "__MSG_searchUrl__", "search_url": "__MSG_searchUrl__",
"search_form": "__MSG_searchForm__", "search_form": "__MSG_searchForm__",
"search_url_get_params": "__MSG_searchUrlGetParams__", "search_url_get_params": "__MSG_searchUrlGetParams__"
"suggest_url": "__MSG_suggestUrl__",
"suggest_url_get_params": "__MSG_suggestUrlGetParams__"
} }
} }
} }

4
browser/components/search/extensions/amazondotcn/_locales/default/messages.json
View file

@ -1,8 +1,8 @@
{ {
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.cn/mn/searchApp" "message": "https://www.amazon.cn/s"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0&keywords={searchTerms}" "message": "k={searchTerms}"
} }
} }

4
browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json
View file

@ -1,8 +1,8 @@
{ {
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.cn/gp/search" "message": "https://www.amazon.cn/s"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "ie=UTF8&camp=536&creative=3200&index=aps&linkCode=ur2&tag=mozilla&keywords={searchTerms}" "message": "k={searchTerms}"
} }
} }

2
browser/components/search/extensions/amazondotcn/manifest.json
View file

@ -2,7 +2,7 @@
"name": "亚马逊", "name": "亚马逊",
"description": "亚马逊搜索", "description": "亚马逊搜索",
"manifest_version": 2, "manifest_version": 2,
"version": "1.2", "version": "1.3",
"browser_specific_settings": { "browser_specific_settings": {
"gecko": { "gecko": {
"id": "amazondotcn@search.mozilla.org" "id": "amazondotcn@search.mozilla.org"

9
browser/components/search/extensions/amazondotcom/_locales/en/messages.json
View file

@ -6,15 +6,12 @@
"message": "Amazon.com Search" "message": "Amazon.com Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.com/exec/obidos/external-search/" "message": "https://www.amazon.com/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.com/exec/obidos/external-search/" "message": "https://www.amazon.com/"
},
"suggestUrl": {
"message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search" "message": "k={searchTerms}"
} }
} }

9
browser/components/search/extensions/amazondotcom/_locales/us/messages.json
View file

@ -6,15 +6,12 @@
"message": "Amazon.com Search" "message": "Amazon.com Search"
}, },
"searchUrl": { "searchUrl": {
"message": "https://www.amazon.com/exec/obidos/external-search/" "message": "https://www.amazon.com/s"
}, },
"searchForm": { "searchForm": {
"message": "https://www.amazon.com/exec/obidos/external-search/" "message": "https://www.amazon.com/"
},
"suggestUrl": {
"message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
}, },
"searchUrlGetParams": { "searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=moz-us-20&sourceid=Mozilla-search" "message": "k={searchTerms}"
} }
} }

3
browser/components/search/extensions/amazondotcom/manifest.json
View file

@ -2,7 +2,7 @@
"name": "__MSG_extensionName__", "name": "__MSG_extensionName__",
"description": "__MSG_extensionDescription__", "description": "__MSG_extensionDescription__",
"manifest_version": 2, "manifest_version": 2,
"version": "1.6", "version": "1.7",
"browser_specific_settings": { "browser_specific_settings": {
"gecko": { "gecko": {
"id": "amazondotcom@search.mozilla.org" "id": "amazondotcom@search.mozilla.org"
@ -20,7 +20,6 @@
"name": "__MSG_extensionName__", "name": "__MSG_extensionName__",
"search_url": "__MSG_searchUrl__", "search_url": "__MSG_searchUrl__",
"search_form": "__MSG_searchForm__", "search_form": "__MSG_searchForm__",
"suggest_url": "__MSG_suggestUrl__",
"search_url_get_params": "__MSG_searchUrlGetParams__" "search_url_get_params": "__MSG_searchUrlGetParams__"
} }
} }

3
browser/components/search/test/browser/browser_searchEngine_behaviors.js
View file

@ -10,8 +10,7 @@
const SEARCH_ENGINE_DETAILS = [ const SEARCH_ENGINE_DETAILS = [
{ {
alias: "a", alias: "a",
baseURL: baseURL: "https://www.amazon.com/s?k=foo",
"https://www.amazon.com/exec/obidos/external-search/?field-keywords=foo&ie=UTF-8&mode=blended&tag=moz-us-20&sourceid=Mozilla-search",
codes: { codes: {
context: "", context: "",
keyword: "", keyword: "",

6
browser/installer/allowed-dupes.mn
View file

@ -108,3 +108,9 @@ browser/chrome/browser/skin/classic/browser/customize.svg
# Bug 1718144 - De-duplicate lightbulb icon # Bug 1718144 - De-duplicate lightbulb icon
browser/features/webcompat-reporter@mozilla.org/icons/lightbulb.svg browser/features/webcompat-reporter@mozilla.org/icons/lightbulb.svg
chrome/toolkit/skin/classic/global/icons/lightbulb.svg chrome/toolkit/skin/classic/global/icons/lightbulb.svg
# Bug 1861662 - These will be removed with new search config changes
browser/chrome/browser/search-extensions/amazondotcn/_locales/default/messages.json
browser/chrome/browser/search-extensions/amazondotcn/_locales/mozillaonline/messages.json
browser/chrome/browser/search-extensions/amazondotcom/_locales/en/messages.json
browser/chrome/browser/search-extensions/amazondotcom/_locales/us/messages.json

51
toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js
View file

@ -116,8 +116,7 @@ const test = new SearchConfigTest({
regions: ["au"], regions: ["au"],
}, },
], ],
suggestionUrlBase: "https://completion.amazon.com.au/search/complete", noSuggestionsURL: true,
suggestUrlCode: "mkt=111172",
}, },
{ {
domain: "amazon.ca", domain: "amazon.ca",
@ -128,9 +127,7 @@ const test = new SearchConfigTest({
regions: ["ca"], regions: ["ca"],
}, },
], ],
searchUrlCode: "tag=mozillacanada-20", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.ca/search/complete",
suggestUrlCode: "mkt=7",
}, },
{ {
domain: "amazon.cn", domain: "amazon.cn",
@ -140,7 +137,6 @@ const test = new SearchConfigTest({
regions: ["cn"], regions: ["cn"],
}, },
], ],
searchUrlCode: "ix=sunray",
noSuggestionsURL: true, noSuggestionsURL: true,
}, },
{ {
@ -153,8 +149,7 @@ const test = new SearchConfigTest({
}, },
], ],
searchUrlCode: "tag=mozillajapan-fx-22", searchUrlCode: "tag=mozillajapan-fx-22",
suggestionUrlBase: "https://completion.amazon.co.jp/search/complete", noSuggestionsURL: true,
suggestUrlCode: "mkt=6",
}, },
{ {
domain: "amazon.co.uk", domain: "amazon.co.uk",
@ -165,9 +160,7 @@ const test = new SearchConfigTest({
regions: ["gb", "ie"], regions: ["gb", "ie"],
}, },
], ],
searchUrlCode: "tag=firefox-uk-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.co.uk/search/complete",
suggestUrlCode: "mkt=3",
}, },
{ {
domain: "amazon.com", domain: "amazon.com",
@ -178,7 +171,7 @@ const test = new SearchConfigTest({
regions: ["us"], regions: ["us"],
}, },
], ],
searchUrlCode: "tag=moz-us-20", noSuggestionsURL: true,
}, },
{ {
domain: "amazon.com", domain: "amazon.com",
@ -192,7 +185,7 @@ const test = new SearchConfigTest({
}, },
], ],
excluded: [{ regions: mainShippedRegions }], excluded: [{ regions: mainShippedRegions }],
searchUrlCode: "tag=mozilla-20", noSuggestionsURL: true,
}, },
{ {
domain: "amazon.de", domain: "amazon.de",
@ -203,9 +196,7 @@ const test = new SearchConfigTest({
regions: ["at", "ch", "de"], regions: ["at", "ch", "de"],
}, },
], ],
searchUrlCode: "tag=firefox-de-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.de/search/complete",
suggestUrlCode: "mkt=4",
}, },
{ {
domain: "amazon.es", domain: "amazon.es",
@ -216,9 +207,7 @@ const test = new SearchConfigTest({
regions: ["es", "pt"], regions: ["es", "pt"],
}, },
], ],
searchUrlCode: "tag=mozillaspain-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.es/search/complete",
suggestUrlCode: "mkt=44551",
}, },
{ {
domain: "amazon.fr", domain: "amazon.fr",
@ -235,9 +224,7 @@ const test = new SearchConfigTest({
}, },
}, },
], ],
searchUrlCode: "tag=firefox-fr-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.fr/search/complete",
suggestUrlCode: "mkt=5",
}, },
{ {
domain: "amazon.in", domain: "amazon.in",
@ -251,8 +238,7 @@ const test = new SearchConfigTest({
regions: ["in"], regions: ["in"],
}, },
], ],
suggestionUrlBase: "https://completion.amazon.in/search/complete", noSuggestionsURL: true,
suggestUrlCode: "mkt=44571",
}, },
{ {
domain: "amazon.it", domain: "amazon.it",
@ -263,9 +249,7 @@ const test = new SearchConfigTest({
regions: ["it", "sm", "va"], regions: ["it", "sm", "va"],
}, },
], ],
searchUrlCode: "tag=firefoxit-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.it/search/complete",
suggestUrlCode: "mkt=35691",
}, },
{ {
domain: "amazon.nl", domain: "amazon.nl",
@ -276,9 +260,7 @@ const test = new SearchConfigTest({
regions: ["nl"], regions: ["nl"],
}, },
], ],
searchUrlCode: "tag=mozillanether-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.nl/search/complete",
suggestUrlCode: "mkt=328451",
}, },
{ {
domain: "amazon.nl", domain: "amazon.nl",
@ -296,9 +278,7 @@ const test = new SearchConfigTest({
}, },
}, },
], ],
searchUrlCode: "tag=mozillanether-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.nl/search/complete",
suggestUrlCode: "mkt=328451",
}, },
{ {
domain: "amazon.se", domain: "amazon.se",
@ -309,9 +289,7 @@ const test = new SearchConfigTest({
regions: ["se"], regions: ["se"],
}, },
], ],
searchUrlCode: "tag=mozillasweede-21", noSuggestionsURL: true,
suggestionUrlBase: "https://completion.amazon.se/search/complete",
suggestUrlCode: "mkt=704403121",
}, },
], ],
}); });
@ -337,7 +315,6 @@ add_task(async function test_searchConfig_amazon_pre89() {
d => d.telemetryId == "amazondotcom-us" d => d.telemetryId == "amazondotcom-us"
); );
details.telemetryId = "amazondotcom"; details.telemetryId = "amazondotcom";
details.searchUrlCode = "tag=mozilla-20";
// nl not present due to urls that don't work. // nl not present due to urls that don't work.
let availableIn = test._config.available.included; let availableIn = test._config.available.included;

6
toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js
View file

@ -78,12 +78,6 @@ tests.push({
region: "CN", region: "CN",
distribution: "MozillaOnline", distribution: "MozillaOnline",
test: engines => test: engines =>
hasParams(engines, "亚马逊", "searchbar", "ie=UTF8") &&
hasParams(engines, "亚马逊", "suggestions", "tag=mozilla") &&
hasParams(engines, "亚马逊", "homepage", "camp=536") &&
hasParams(engines, "亚马逊", "homepage", "creative=3200") &&
hasParams(engines, "亚马逊", "homepage", "index=aps") &&
hasParams(engines, "亚马逊", "homepage", "linkCode=ur2") &&
hasEnginesFirst(engines, ["百度", "Bing", "Google", "亚马逊", "维基百科"]), hasEnginesFirst(engines, ["百度", "Bing", "Google", "亚马逊", "维基百科"]),
}); });