Bug 640504 - Qt-Fennec, Language Code is not read correctly from System. r=romaxa a=npodb
authorJeremias Bosch <jeremias.bosch@gmail.com>
Tue, 15 Mar 2011 13:30:34 -0700
changeset 63421 ee18eff42c2e73e646f9658ed0661b815e9dc506
parent 63420 34d44aee909267d69e2baf00a0dbec672af7bb23
child 63422 02e5836b10c242a9d106836b68d37d62074cba9b
push id19205
push userromaxa@gmail.com
push dateWed, 16 Mar 2011 02:05:57 +0000
treeherdermozilla-central@ee18eff42c2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersromaxa, npodb
bugs640504
milestone2.0b13pre
first release with
nightly linux32
ee18eff42c2e / 4.0b13pre / 20110316030411 / files
nightly linux64
ee18eff42c2e / 4.0b13pre / 20110316030411 / files
nightly mac
ee18eff42c2e / 4.0b13pre / 20110316030411 / files
nightly win32
ee18eff42c2e / 4.0b13pre / 20110316030411 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 640504 - Qt-Fennec, Language Code is not read correctly from System. r=romaxa a=npodb
intl/locale/src/nsLocaleService.cpp
--- a/intl/locale/src/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp
@@ -177,17 +177,17 @@ nsLocaleService::nsLocaleService(void)
 
         nsRefPtr<nsLocale> resultLocale(new nsLocale());
         if ( resultLocale == NULL ) { 
             return; 
         }
 
 
 #ifdef MOZ_WIDGET_QT
-        const char* lang = QLocale::languageToString(QLocale::system().language()).toAscii();
+        const char* lang = QLocale::system().name().toAscii();
 #else
         // Get system configuration
         const char* lang = getenv("LANG");
 #endif
 
         for( i = 0; i < LocaleListLength; i++ ) {
             nsresult result;
             // setlocale( , "") evaluates LC_* and LANG