From e30f6a8c6b053e7a7b9c54fb3fdaed4e73bb5389 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 12 Oct 2018 17:39:14 +0200 Subject: 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 Tested-by: Jenkins --- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop/source/pkgchk') diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 96b086878f58..e7f8a2927806 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -155,7 +155,7 @@ void CommandEnvironmentImpl::printLicense( Reference< css::i18n::XCollator > xCollator = css::i18n::Collator::create( m_xComponentContext ); xCollator->loadDefaultCollator( - LanguageTag(utl::ConfigManager::getLocale()).getLocale(), + LanguageTag(utl::ConfigManager::getUILocale()).getLocale(), css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE); do -- cgit v1.2.3