[tor-commits] [tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Bug #5926: Allow customization of content JS locale.

[mikeperry at torproject.org]

commit cc614e00508c5750741919a3a3890461ee0edbf2
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Wed Mar 25 12:07:56 2015 -0700

    fixup! Bug #5926: Allow customization of content JS locale.
---
 xpcom/build/nsXPComInit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index 12e46d4..ebc3ff7 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -478,7 +478,7 @@ void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* clos
     // Read the pref to see if we will use US English locale.
     bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false);
     // Set the application-wide C-locale. Needed for Date.toLocaleFormat().
-    setlocale(LC_ALL, useUSEnglishLocale ? "en_US" : sSystemLocale);
+    setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale);
     // Now override the JavaScript Runtime Locale that is used by the Intl API
     // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare.
     JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale);