diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-27 20:32:10 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-27 20:35:32 +0100 |
| commit | b1d3900317bba8f3d0ab773e517a40b40934e0f7 (patch) | |
| tree | 663f1e0ab37b79cf6e6926ddbfa42b58ec492c02 /i18npool | |
| parent | 201a3b83d0868c8b0a884a17779b6a4838ed0615 (diff) | |
do not resolve LANGUAGE_NONE in MsLangId::getRealLanguage()
LANGUAGE_NONE was resolved to UI language, don't do that, if desired use
LANGUAGE_HID_HUMAN_INTERFACE_DEVICE instead.
Change-Id: I4a45653c9dfef7cc2cddb941ea1174189708cea2
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/inc/i18npool/mslangid.hxx | 10 | ||||
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx index eba15ad944d9..c1682c3dd2c8 100644 --- a/i18npool/inc/i18npool/mslangid.hxx +++ b/i18npool/inc/i18npool/mslangid.hxx @@ -68,11 +68,11 @@ public: application's configuration. @returns - case LANGUAGE_PROCESS_OR_USER_DEFAULT : configured or system language - case LANGUAGE_SYSTEM_DEFAULT : configured or system language - case LANGUAGE_SYSTEM : configured or system language - case LANGUAGE_NONE : configured or system UI language - case LANGUAGE_DONTKNOW : LANGUAGE_ENGLISH_US + case LANGUAGE_PROCESS_OR_USER_DEFAULT : configured or system language + case LANGUAGE_SYSTEM_DEFAULT : configured or system language + case LANGUAGE_SYSTEM : configured or system language + case LANGUAGE_HID_HUMAN_INTERFACE_DEVICE : configured or system UI language + case LANGUAGE_DONTKNOW : LANGUAGE_ENGLISH_US else: nLang In case the configured language is LANGUAGE_SYSTEM, which is also diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 405ce2993704..2395d35cd2f1 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -90,7 +90,7 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang ) else nLang = nConfiguredSystemLanguage; break; - case LANGUAGE_NONE : + case LANGUAGE_HID_HUMAN_INTERFACE_DEVICE : if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM) nLang = getSystemUILanguage(); else @@ -161,7 +161,7 @@ void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang, else { // Still resolve LANGUAGE_DONTKNOW if resolving is not requested, - // but not LANGUAGE_NONE or others. + // but not LANGUAGE_SYSTEM or others. if (bResolveSystem || nLang == LANGUAGE_DONTKNOW) nLang = MsLangId::getRealLanguage( nLang); convertLanguageToLocale( nLang, aLocale); |