diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-12-20 16:02:18 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-22 20:08:51 +0100 |
commit | 1c7d3390022908cfbfd30f55e8c0c3b60a045da7 (patch) | |
tree | 07e34f151fbfc0c5ec39b2417f0e86f1e02d5c79 /desktop/source/app | |
parent | 91d361604781f92640c9727add1e08cde854037e (diff) |
request installation of langpack via packagekit
if ui is set to track the locale automatically and the current locale
has no match in installed resources but has a match in the list of
languages that libreoffice was compiled to contain
so e.g. de_AT locale shouldn't trigger the installation of anything if
langpack-de is already installed and yue_HK shouldn't trigger install
of anything cause that not supported (at time of writing) for libreoffice
put Fedora/RHEL/Ubuntu naming schemes in here.
I moved the lang code from svl to svtools so I could use the restart dialog
to prompt to restart after the langpack is installed, but packagekit's blocking
mode seems to be no longer blocking and control returns immediately which is a
change since the last time I played with this stuff, so drop the restart thing
for now. The lack of a blocking modal also makes the "run this on idle when there's
a toplevel window up and running" a bit futile, but lets keep that for now anyway.
caolanm->rene: I know you'd disable this anyway, so Debian is left out, there's
also config key Office/Common/PackageKit/EnableLangpackInstallation to disable
this too.
Change-Id: Ice731be539850338ccdd8af87839e0b4d83f01e7
Reviewed-on: https://gerrit.libreoffice.org/46856
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/app')
-rw-r--r-- | desktop/source/app/langselect.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 4ce877a3d926..86ce7434e6ab 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -37,6 +37,7 @@ #include <sal/log.hxx> #include <sal/types.h> #include <svl/languageoptions.hxx> +#include <svtools/langhelp.hxx> #include <app.hxx> @@ -103,7 +104,7 @@ bool prepareLocale() { } } if (locale.isEmpty()) { - locale = getInstalledLocaleForSystemUILanguage(inst); + locale = getInstalledLocaleForSystemUILanguage(inst, true); } if (locale.isEmpty()) { return false; |