author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 23 Sep 2015 07:44:44 +0200 | |
branch | firefox41 |
changeset 883 | 7aa7715fdc8f |
parent 869 | 0dd25a92df97 |
child 899 | 44a28160de40 |
permissions | -rw-r--r-- |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
779 | 3 |
# Parent 5a29924228527f8882c83cf62d470963ea1ce62e |
869 | 4 |
# Parent 228ea0669fa8cc78532b71d7bdc4bad5477f246e |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE |
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
779 | 7 |
diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp |
8 |
--- a/intl/locale/nsLocaleService.cpp |
|
9 |
+++ b/intl/locale/nsLocaleService.cpp |
|
718 | 10 |
@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
11 |
nsRefPtr<nsLocale> resultLocale(new nsLocale()); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
12 |
NS_ENSURE_TRUE_VOID(resultLocale); |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
185
diff
changeset
|
13 |
|
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
185
diff
changeset
|
14 |
#ifdef MOZ_WIDGET_QT |
650 | 15 |
const char* lang = QLocale::system().name().toUtf8(); |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
185
diff
changeset
|
16 |
#else |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
17 |
// Get system configuration |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
18 |
const char* lang = getenv("LANG"); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
19 |
+ const char* language = getenv("LANGUAGE"); |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
#endif |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
185
diff
changeset
|
21 |
|
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
22 |
nsAutoString xpLocale, platformLocale; |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
23 |
nsAutoString category, category_platform; |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
24 |
int i; |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
25 |
|
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
26 |
for( i = 0; i < LocaleListLength; i++ ) { |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
27 |
nsresult result; |
869 | 28 |
@@ -158,16 +159,21 @@ nsLocaleService::nsLocaleService(void) |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
29 |
} else { |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
30 |
CopyASCIItoUTF16(lang, platformLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
31 |
result = nsPosixLocale::GetXPLocale(lang, xpLocale); |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
} |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
33 |
} |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
34 |
if (NS_FAILED(result)) { |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
35 |
return; |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
} |
294
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
37 |
+ // LANGUAGE is overriding LC_MESSAGES |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
38 |
+ if (i == LC_MESSAGES && language && *language) { |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
39 |
+ CopyASCIItoUTF16(language, platformLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
40 |
+ result = nsPosixLocale::GetXPLocale(language, xpLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
41 |
+ } |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
42 |
resultLocale->AddCategory(category, xpLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
43 |
resultLocale->AddCategory(category_platform, platformLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
44 |
} |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
45 |
mSystemLocale = do_QueryInterface(resultLocale); |
5330447b83a3
update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
46 |
mApplicationLocale = do_QueryInterface(resultLocale); |
161
a6dc70babb5f
honour LANGUAGE environment variable (bmo#583793)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
229
diff
changeset
|
48 |
#endif // XP_UNIX |
718 | 49 |