Bug 1405685 - Use geospecific defaults for all locales. r?florian draft
authorMichael Kaply <mozilla@kaply.com>
Tue, 30 Jan 2018 15:19:33 -0800
changeset 749140 b452b4da2e9c06876343001ac29fe0728aea5532
parent 748899 fd995039d89708923b5673ecebc652967d40bd4e
push id97324
push userbmo:mozilla@kaply.com
push dateTue, 30 Jan 2018 23:21:48 +0000
reviewersflorian
bugs1405685
milestone60.0a1
Bug 1405685 - Use geospecific defaults for all locales. r?florian MozReview-Commit-ID: 6nAAvsoDZZu
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=Google");
 pref("browser.search.order.US.1",                "data:text/plain,browser.search.order.US.1=Google");
 pref("browser.search.order.US.2",                "data:text/plain,browser.search.order.US.2=Yahoo");
 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,9 +1,5 @@
 # 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);