diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2018-08-11 00:23:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-08-24 17:33:09 +0200 |
| commit | 5bec6b86cb08b814076f4bf51aee1547f13b61ec (patch) | |
| tree | c4643f8c7069a9f62220708e8e85c9fcdb668b15 /i18nlangtag | |
| parent | cb7b687a152d9ab71eaeb9efd5e936339bdf91e5 (diff) | |
tdf#119117: get phonebook sort work by tweaking ICU call mechanism
Using "phonebook" as variant does't work with de_DE
since it gives de_DE_PHONEBOOK whereas icu expects de__PHONEBOOK
See http://userguide.icu-project.org/locale#TOC-Variant-code,
Level 2 canonicalization, 8.
So let variant empty and use the fourth arg of icuLocale "keywords"
See constructors in http://icu-project.org/apiref/icu4c/classicu_1_1Locale.html
Change-Id: I6c216c86cdd32abfa477c14a80d1b8794b536900
Reviewed-on: https://gerrit.libreoffice.org/58870
(cherry picked from commit 13db6e8671c36e1a028d6a8ad63f518e60f84870)
Reviewed-on: https://gerrit.libreoffice.org/59278
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetagicu.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx b/i18nlangtag/source/languagetag/languagetagicu.cxx index 33a98844043f..18d37f704773 100644 --- a/i18nlangtag/source/languagetag/languagetagicu.cxx +++ b/i18nlangtag/source/languagetag/languagetagicu.cxx @@ -35,13 +35,15 @@ icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag ) // static -icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag, const OUString & rVariant ) +icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag, const OUString & rVariant, const OUString & rKeywords ) { /* FIXME: how should this work with any BCP47? */ return icu::Locale( OUStringToOString( rLanguageTag.getLanguage(), RTL_TEXTENCODING_ASCII_US).getStr(), OUStringToOString( rLanguageTag.getCountry(), RTL_TEXTENCODING_ASCII_US).getStr(), - OUStringToOString( rVariant, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString( rVariant, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString( rKeywords, RTL_TEXTENCODING_ASCII_US).getStr() + ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |