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 5a29924228527f8882c83cf62d470963ea1ce62e |
3 # Parent 5a29924228527f8882c83cf62d470963ea1ce62e |
|
4 # Parent 228ea0669fa8cc78532b71d7bdc4bad5477f246e |
4 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
5 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
5 |
6 |
6 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 |
7 --- a/intl/locale/nsLocaleService.cpp |
8 --- a/intl/locale/nsLocaleService.cpp |
8 +++ b/intl/locale/nsLocaleService.cpp |
9 +++ b/intl/locale/nsLocaleService.cpp |
22 nsAutoString category, category_platform; |
23 nsAutoString category, category_platform; |
23 int i; |
24 int i; |
24 |
25 |
25 for( i = 0; i < LocaleListLength; i++ ) { |
26 for( i = 0; i < LocaleListLength; i++ ) { |
26 nsresult result; |
27 nsresult result; |
27 @@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void) |
28 @@ -158,16 +159,21 @@ nsLocaleService::nsLocaleService(void) |
28 } else { |
29 } else { |
29 CopyASCIItoUTF16(lang, platformLocale); |
30 CopyASCIItoUTF16(lang, platformLocale); |
30 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
31 result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
31 } |
32 } |
32 } |
33 } |