Bug 1405685 - Use geo specific defaults for all locales. r?mconnor draft
authorMichael Kaply <mozilla@kaply.com>
Tue, 31 Oct 2017 10:00:29 -0500
changeset 689411 4da34abead172f25e43952d5f9e8429ea08790d0
parent 689353 371e44e0034771ec8a5ac3c5a6518ef608227b99
child 738314 0f84800a99e1653e15456686346059777ba897b3
push id87020
push usermozilla@kaply.com
push dateTue, 31 Oct 2017 15:00:50 +0000
reviewersmconnor
bugs1405685
milestone58.0a1
Bug 1405685 - Use geo specific defaults for all locales. r?mconnor MozReview-Commit-ID: BPi36Bwtj5b
browser/app/profile/firefox.js
browser/locales/en-US/firefox-l10n.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -386,19 +386,17 @@ pref("browser.search.searchEnginesURL", 
 pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
 
 // Ordering of Search Engines in the Engine list.
 pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
 
 // Market-specific search defaults
-// This is disabled globally, and then enabled for individual locales
-// in firefox-l10n.js (eg. it's enabled for en-US).
-pref("browser.search.geoSpecificDefaults", false);
+pref("browser.search.geoSpecificDefaults", true);
 pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
 
 // US specific default (used as a fallback if the geoSpecificDefaults request fails).
 pref("browser.search.defaultenginename.US",      "data:text/plain,browser.search.defaultenginename.US=Yahoo");
 pref("browser.search.order.US.1",                "data:text/plain,browser.search.order.US.1=Yahoo");
 pref("browser.search.order.US.2",                "data:text/plain,browser.search.order.US.2=Google");
 pref("browser.search.order.US.3",                "data:text/plain,browser.search.order.US.3=Bing");
 
--- a/browser/locales/en-US/firefox-l10n.js
+++ b/browser/locales/en-US/firefox-l10n.js
@@ -1,11 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #filter substitution
 
-# LOCALIZATION NOTE: this preference is set to true for en-US specifically,
-# locales without this line have the setting set to false by default.
-pref("browser.search.geoSpecificDefaults", true);
-
 pref("general.useragent.locale", "@AB_CD@");