diff options
| author | Eike Rathke <erack@redhat.com> | 2017-12-06 13:21:50 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-06 20:13:22 +0100 |
| commit | c2bd06120b932bf3757f19bdf8c8d9ee8a31f557 (patch) | |
| tree | 5cd89e1bc2e2ea7eef1cc13c7e04265dabc2f798 /shell/Library_localebe.mk | |
| parent | Prevent out-of-bounds access, tdf#114228 related (diff) | |
| download | core-c2bd06120b932bf3757f19bdf8c8d9ee8a31f557.tar.gz core-c2bd06120b932bf3757f19bdf8c8d9ee8a31f557.zip | |
Handle conversion from glibc locale to BCP 47 language tag
The backend's ImplGetLocale() didn't handle variants, so
ca_ES@valencia ended up as ca-ES instead of ca-ES-valencia, which
made a difference with for example the UI language being set to
Default resulting in only ca instead of ca-valencia, which then
is also written to /org.openoffice.Setup/L10N/ooLocale during
startup and obtained later.
This only for the *iX branch, no idea if and what could be
adjusted for Windows or MacOSX.
Change-Id: I050f6f643571ccdc669fb91b06f3bb516f96e8d5
Reviewed-on: https://gerrit.libreoffice.org/45946
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'shell/Library_localebe.mk')
| -rw-r--r-- | shell/Library_localebe.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 7c4931b2ce39..b8d8aba8f15c 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppu \ cppuhelper \ sal \ + i18nlangtag \ )) $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) |