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 0d6917b8f28f6e0398dbf329dda4932ba4f997c2 |
3 # Parent 97c6ae4c21e703a18e04f4d9fae9e2f06aeb13df |
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 @@ -160,16 +160,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(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().toAscii(); |
15 #else |
15 #else |
16 // Get system configuration |
16 // Get system configuration |
22 nsAutoString category, category_platform; |
22 nsAutoString category, category_platform; |
23 int i; |
23 int i; |
24 |
24 |
25 for( i = 0; i < LocaleListLength; i++ ) { |
25 for( i = 0; i < LocaleListLength; i++ ) { |
26 nsresult result; |
26 nsresult result; |
27 @@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void) |
27 @@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) |
28 } else { |
28 } else { |
29 CopyASCIItoUTF16(lang, platformLocale); |
29 CopyASCIItoUTF16(lang, platformLocale); |
30 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
30 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
31 } |
31 } |
32 } |
32 } |