1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 5a29924228527f8882c83cf62d470963ea1ce62e |
3 # Parent 5a29924228527f8882c83cf62d470963ea1ce62e |
4 # Parent 55b6ae7fd3ebf28f960031801f1948dfc1bd80d2 |
4 # Parent bf7b3a5853467b34f13465102a19b9c7c2524bd4 |
5 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
5 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
6 |
6 |
7 diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp |
7 diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp |
8 --- a/intl/locale/nsLocaleService.cpp |
8 --- a/intl/locale/nsLocaleService.cpp |
9 +++ b/intl/locale/nsLocaleService.cpp |
9 +++ b/intl/locale/nsLocaleService.cpp |
10 @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) |
10 @@ -114,16 +114,17 @@ nsLocaleService::nsLocaleService(void) |
|
11 NS_ENSURE_SUCCESS_VOID(rv); |
|
12 #endif |
|
13 #if defined(XP_UNIX) && !defined(XP_MACOSX) |
11 RefPtr<nsLocale> resultLocale(new nsLocale()); |
14 RefPtr<nsLocale> resultLocale(new nsLocale()); |
12 NS_ENSURE_TRUE_VOID(resultLocale); |
15 NS_ENSURE_TRUE_VOID(resultLocale); |
13 |
16 |
14 #ifdef MOZ_WIDGET_QT |
|
15 const char* lang = QLocale::system().name().toUtf8(); |
|
16 #else |
|
17 // Get system configuration |
17 // Get system configuration |
18 const char* lang = getenv("LANG"); |
18 const char* lang = getenv("LANG"); |
19 + const char* language = getenv("LANGUAGE"); |
19 + const char* language = getenv("LANGUAGE"); |
20 #endif |
|
21 |
20 |
22 nsAutoString xpLocale, platformLocale; |
21 nsAutoString xpLocale, platformLocale; |
23 nsAutoString category, category_platform; |
22 nsAutoString category, category_platform; |
24 int i; |
23 int i; |
25 |
24 |
26 for( i = 0; i < LocaleListLength; i++ ) { |
25 for( i = 0; i < LocaleListLength; i++ ) { |
27 nsresult result; |
26 nsresult result; |
28 @@ -158,16 +159,21 @@ nsLocaleService::nsLocaleService(void) |
27 // setlocale( , "") evaluates LC_* and LANG |
|
28 @@ -149,16 +150,21 @@ nsLocaleService::nsLocaleService(void) |
29 } else { |
29 } else { |
30 CopyASCIItoUTF16(lang, platformLocale); |
30 CopyASCIItoUTF16(lang, platformLocale); |
31 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
31 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
32 } |
32 } |
33 } |
33 } |