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 # Parent 55b6ae7fd3ebf28f960031801f1948dfc1bd80d2 |
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 @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) |
11 nsRefPtr<nsLocale> resultLocale(new nsLocale()); |
11 RefPtr<nsLocale> resultLocale(new nsLocale()); |
12 NS_ENSURE_TRUE_VOID(resultLocale); |
12 NS_ENSURE_TRUE_VOID(resultLocale); |
13 |
13 |
14 #ifdef MOZ_WIDGET_QT |
14 #ifdef MOZ_WIDGET_QT |
15 const char* lang = QLocale::system().name().toUtf8(); |
15 const char* lang = QLocale::system().name().toUtf8(); |
16 #else |
16 #else |