diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-06-15 09:20:24 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-06-15 21:41:16 +0200 |
| commit | 1b8cbfef2481c06bc6d7bf3c5d5811b0d2b9b423 (patch) | |
| tree | bc7d713e7030676ce5433370fbe626a8c63a6867 | |
| parent | eab9648afc864c8bed4c61f7419aa193e0c37b92 (diff) | |
Use getBcp47() instead of getLanguage()
getLanguage() only returns the language code which can be
ambiguous in case of UI localization, when there are more
than one language variants. Fallback to the first variant
caused mixed language UI, e.g. en-US vs. en-GB, pt vs. pt-BR,
zh-CN vs. zh-TW.
Change-Id: I888423cd4b3c65dbdb900ff3b6bc308fa119be4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96285
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | configmgr/source/access.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 4 | ||||
| -rw-r--r-- | sd/source/core/TransitionPreset.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 9fe7f31cc00f..e07fc8446f51 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -1382,7 +1382,7 @@ rtl::Reference< ChildAccess > Access::getChild(OUString const & name) { // here we override it with the actual current-user's language to // support per-view localization in LOK. if (comphelper::LibreOfficeKit::isActive()) - locale = comphelper::LibreOfficeKit::getLanguageTag().getLanguage(); + locale = comphelper::LibreOfficeKit::getLanguageTag().getBcp47(); if (!locale.isEmpty()) { // Find best match using an adaptation of RFC 4647 lookup matching diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 3be4e76941f8..cf15dc490622 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -478,8 +478,8 @@ const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets( // Support localization per-view. Currently not useful for Desktop // but very much critical for LOK. The cache now is per-language. const OUString aLang = comphelper::LibreOfficeKit::isActive() - ? comphelper::LibreOfficeKit::getLanguageTag().getLanguage() - : SvtSysLocaleOptions().GetLanguageTag().getLanguage(); + ? comphelper::LibreOfficeKit::getLanguageTag().getBcp47() + : SvtSysLocaleOptions().GetLanguageTag().getBcp47(); SolarMutexGuard aGuard; const auto it = mPresetsMap.find(aLang); diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 951959cdb69a..1a8f55b90aed 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -367,8 +367,8 @@ const TransitionPresetList& TransitionPreset::getTransitionPresetList() // Support localization per-view. Currently not useful for Desktop // but very much critical for LOK. The cache now is per-language. const OUString aLang = comphelper::LibreOfficeKit::isActive() - ? comphelper::LibreOfficeKit::getLanguageTag().getLanguage() - : SvtSysLocaleOptions().GetLanguageTag().getLanguage(); + ? comphelper::LibreOfficeKit::getLanguageTag().getBcp47() + : SvtSysLocaleOptions().GetLanguageTag().getBcp47(); SolarMutexGuard aGuard; const auto it = mPresetsMap.find(aLang); |