1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 97c6ae4c21e703a18e04f4d9fae9e2f06aeb13df |
3 # Parent df748bfc0eaca6dedf086cfd7167392416bfae27 |
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 @@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) |
9 @@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) |
10 nsRefPtr<nsLocale> resultLocale(new nsLocale()); |
10 nsRefPtr<nsLocale> resultLocale(new nsLocale()); |
11 NS_ENSURE_TRUE_VOID(resultLocale); |
11 NS_ENSURE_TRUE_VOID(resultLocale); |
12 |
12 |
13 #ifdef MOZ_WIDGET_QT |
13 #ifdef MOZ_WIDGET_QT |
14 const char* lang = QLocale::system().name().toAscii(); |
14 const char* lang = QLocale::system().name().toUtf8(); |
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 |