diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-01-28 10:03:32 -0500 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-12 09:45:12 +0200 |
| commit | 5ede6b3bca9d174c77d16a1bc182ab83eb963398 (patch) | |
| tree | d9371847c966560ed129cfd01abb23eae77f8a20 /configmgr/source | |
| parent | b7ea87bf13c2faea24c95a0394f63279f2bb2966 (diff) | |
configmgr: support changing locale language
Change-Id: Ia8318ce8ca3ae9fdbd526e0d41861e2863fb9a94
Reviewed-on: https://gerrit.libreoffice.org/68262
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/73485
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/access.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index b2fcb3cf9ad0..6e8fc5227590 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -71,6 +71,8 @@ #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/util/ElementChange.hpp> #include <comphelper/sequence.hxx> +#include <comphelper/lok.hxx> +#include <i18nlangtag/languagetag.hxx> #include <cppu/unotype.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> @@ -1380,6 +1382,13 @@ rtl::Reference< ChildAccess > Access::getChild(OUString const & name) { locale.isEmpty(), "configmgr", ("access best-matching localized property value via \"*<locale>\"" " with empty <locale>; falling back to defaults")); + + // Since the locale given to us is the one used at initialization, + // 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(); + if (!locale.isEmpty()) { // Find best match using an adaptation of RFC 4647 lookup matching // rules, removing "-" or "_" delimited segments from the end: |