diff options
| author | Eike Rathke <erack@redhat.com> | 2018-10-12 17:39:14 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-10-12 19:25:14 +0200 |
| commit | e30f6a8c6b053e7a7b9c54fb3fdaed4e73bb5389 (patch) | |
| tree | 7627772b0014d7cac2e19031c65c80e3b52d6050 /desktop/source/deployment | |
| parent | 5d5e0da5c314773129d8153363e2892fc359a744 (diff) | |
tdf#119739 split ConfigManager::getLocale(), getUILocale(), getWorkLocale()
To prevent further confusion which is which, dbaccess
UserInformation already got that wrong since ever.
/org.openoffice.Setup/L10N/ooLocale is the UI locale.
/org.openoffice.Setup/L10N/ooSetupSystemLocale is the work locale.
Confusingly due to legacy when the setup program was a separate
binary that picked the UI ooLocale and later set up the default
(system) work locale as well.
Change-Id: I9a05ad39f5fb65c54076ff5789ba7a2cc06ad23a
Reviewed-on: https://gerrit.libreoffice.org/61725
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/misc/dp_resource.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 4f5671df9879..c6e9d2a18e3a 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -37,7 +37,7 @@ namespace { struct OfficeLocale : public rtl::StaticWithInit<LanguageTag, OfficeLocale> { const LanguageTag operator () () { - OUString slang(utl::ConfigManager::getLocale()); + OUString slang(utl::ConfigManager::getUILocale()); //fallback, the locale is currently only set when the user starts the //office for the first time. if (slang.isEmpty()) |