Bug 981664 - Move B2G l10n override to b2g-l10n.js. r=fabrice, r=vingtetun
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Tue, 29 Apr 2014 01:39:00 -0400
changeset 199981 8b6c2a901df64db1cbdc22eb9d43fe637178f26b
parent 199980 a26c468310d527eea90e1b6fd9dfb973bead62a3
child 199982 566be5533bc5440a3e3e7e7142b9dadba77fd9b9
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice, vingtetun
bugs981664
milestone32.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 981664 - Move B2G l10n override to b2g-l10n.js. r=fabrice, r=vingtetun Moving those overrides to the locales/ subdir makes more sense and it will help us getting Mulet building correctly.
b2g/app/b2g.js
b2g/locales/en-US/b2g-l10n.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -151,21 +151,16 @@ pref("browser.search.update.log", false)
 pref("browser.search.updateinterval", 6);
 
 // enable search suggestions by default
 pref("browser.search.suggest.enabled", true);
 
 // tell the search service that we don't really expose the "current engine"
 pref("browser.search.noCurrentEngine", true);
 
-// Enable sparse localization by setting a few package locale overrides
-pref("chrome.override_package.global", "b2g-l10n");
-pref("chrome.override_package.mozapps", "b2g-l10n");
-pref("chrome.override_package.passwordmgr", "b2g-l10n");
-
 // enable xul error pages
 pref("browser.xul.error_pages.enabled", true);
 
 // disable color management
 pref("gfx.color_management.mode", 0);
 
 // don't allow JS to move and resize existing windows
 pref("dom.disable_window_move_resize", true);
--- a/b2g/locales/en-US/b2g-l10n.js
+++ b/b2g/locales/en-US/b2g-l10n.js
@@ -1,7 +1,12 @@
 # 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
 
 pref("general.useragent.locale", "@AB_CD@");
+
+// Enable sparse localization by setting a few package locale overrides
+pref("chrome.override_package.global", "b2g-l10n");
+pref("chrome.override_package.mozapps", "b2g-l10n");
+pref("chrome.override_package.passwordmgr", "b2g-l10n");