firefox-no-default-ualocale.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 20 Dec 2011 21:21:15 +0100
changeset 364 0f5c150b9dcd
parent 192 bb4213ee70c8
child 409 ff30593d2daa
permissions -rw-r--r--
merge changes from mozilla:Factory including full changelog

# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp
 
 pref("lightweightThemes.update.enabled", true);
 
 pref("keyword.enabled", true);
 // Override the default keyword.URL. Empty value means
 // "use the search service's default engine"
 pref("keyword.URL", "");
 
-pref("general.useragent.locale", "@AB_CD@");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 pref("general.skins.selectedSkin", "classic/1.0");
 
 pref("general.smoothScroll", false);
 #ifdef UNIX_BUT_NOT_MAC
 pref("general.autoScroll", false);
 #else
 pref("general.autoScroll", true);
 #endif