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 /include | |
| 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 'include')
| -rw-r--r-- | include/i18nlangtag/languagetagicu.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/i18nlangtag/languagetagicu.hxx b/include/i18nlangtag/languagetagicu.hxx index 2d0aabdd34ea..e2c9f7ce2b0e 100644 --- a/include/i18nlangtag/languagetagicu.hxx +++ b/include/i18nlangtag/languagetagicu.hxx @@ -41,13 +41,12 @@ public: /** Obtain language tag as ICU icu::Locale, adding variant data. From the LanguageTag only language and country are used to construct - the icu:Locale, the variant field is copied from rVariant. For example - needed to create an icu::Collator instance where the variant field - denotes the algorithm to be used. + the icu:Locale, the variant field is copied from rVariant. + The 4th arg of icu::Locale "keywords" (eg: for collation) Always resolves an empty tag to the system locale. */ - static icu::Locale getIcuLocale( const LanguageTag & rLanguageTag, const OUString & rVariant ); + static icu::Locale getIcuLocale( const LanguageTag & rLanguageTag, const OUString & rVariant, const OUString & rKeywords); }; #endif // INCLUDED_I18NLANGTAG_LANGUAGETAGICU_HXX |