diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-12-22 22:39:39 +0100 |
| commit | 101a79cc4d13a1f566c1b97c1329813eb7c61bcf (patch) | |
| tree | 31bba77cc8656d6882992ea753917adc787241a9 /vcl | |
| parent | a5fe3117e1877fa0bfb55f1cf22cf9394b3f0795 (diff) | |
lokdialog: Allow switching language of some of the ResMgr's.
This way, it is possible to have all the strings translated in dialogs even
when different users use different languages. [It was already possible
to have different languages previously, but not everything in the dialog has
switched - like the buttons at the bottom of the dialogs etc.]
Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9
Reviewed-on: https://gerrit.libreoffice.org/46417
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/46979
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 043f36d750bb..e2841b8b4ed2 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2880,6 +2880,9 @@ const LanguageTag& AllSettings::GetLanguageTag() const return aRet; } + if (comphelper::LibreOfficeKit::isActive()) + return comphelper::LibreOfficeKit::getLanguageTag(); + // SYSTEM locale means: use settings from SvtSysLocale that is resolved if ( mxData->maLocale.isSystemLocale() ) mxData->maLocale = mxData->maSysLocale.GetLanguageTag(); @@ -2895,6 +2898,9 @@ const LanguageTag& AllSettings::GetUILanguageTag() const return aRet; } + if (comphelper::LibreOfficeKit::isActive()) + return comphelper::LibreOfficeKit::getLanguageTag(); + // the UILocale is never changed if ( mxData->maUILocale.isSystemLocale() ) mxData->maUILocale = mxData->maSysLocale.GetUILanguageTag(); |