equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 05766406681babf9a5a433649b5ba2b9741b9962 |
3 # Parent db620d83124746201970dcf50c661957df979eca |
4 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
4 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
5 |
5 |
6 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp |
6 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp |
7 --- a/intl/locale/src/nsLocaleService.cpp |
7 --- a/intl/locale/src/nsLocaleService.cpp |
8 +++ b/intl/locale/src/nsLocaleService.cpp |
8 +++ b/intl/locale/src/nsLocaleService.cpp |
9 @@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) |
9 @@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) |
10 } |
10 } |
11 |
11 |
12 |
12 |
13 #ifdef MOZ_WIDGET_QT |
13 #ifdef MOZ_WIDGET_QT |
14 const char* lang = QLocale::languageToString(QLocale::system().language()).toAscii(); |
14 const char* lang = QLocale::system().name().toAscii(); |
15 #else |
15 #else |
16 // Get system configuration |
16 // Get system configuration |
17 const char* lang = getenv("LANG"); |
17 const char* lang = getenv("LANG"); |
18 + const char* language = getenv("LANGUAGE"); |
18 + const char* language = getenv("LANGUAGE"); |
19 #endif |
19 #endif |
43 } |
43 } |
44 mSystemLocale = do_QueryInterface(resultLocale); |
44 mSystemLocale = do_QueryInterface(resultLocale); |
45 mApplicationLocale = do_QueryInterface(resultLocale); |
45 mApplicationLocale = do_QueryInterface(resultLocale); |
46 } // if ( NS_SUCCEEDED )... |
46 } // if ( NS_SUCCEEDED )... |
47 |
47 |
48 #endif // XP_UNIX || XP_BEOS |
48 #endif // XP_UNIX |