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 df748bfc0eaca6dedf086cfd7167392416bfae27 |
3 # Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c |
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 @@ -122,16 +122,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().toUtf8(); |
14 const char* lang = QLocale::system().name().toUtf8(); |
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 @@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) |
27 @@ -150,16 +151,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 } |
43 } |
43 } |
44 mSystemLocale = do_QueryInterface(resultLocale); |
44 mSystemLocale = do_QueryInterface(resultLocale); |
45 mApplicationLocale = do_QueryInterface(resultLocale); |
45 mApplicationLocale = do_QueryInterface(resultLocale); |
46 |
46 |
47 #endif // XP_UNIX |
47 #endif // XP_UNIX |
48 #ifdef XP_OS2 |
48 |