diff options
| author | Eike Rathke <erack@redhat.com> | 2015-07-09 23:30:09 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:55:59 +0200 |
| commit | 198cea3bf122949580d1ac3167e258e55a9caa25 (patch) | |
| tree | b5f1b9edb0c1c175887cee6a773efb2cb0bb6ce8 /i18nlangtag | |
| parent | 2a16736474db6249c49d50a695f7bcadb49f2d18 (diff) | |
update to language-subtag-registry as of 2015-06-08
(cherry picked from commit 712c4c6e85fcf0c5486f247aafa9af511212278e)
fix langtag test with liblangtag 0.5.7
(cherry picked from commit b43fde69caf456585004b3e1da5161d76eadf057)
c8639daa5a32cf98fa17903424b00916cb6d8c6f
Change-Id: I05ad85ea8d852ef2531db76fa6a79aa068c1699c
Reviewed-on: https://gerrit.libreoffice.org/16904
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 81ec2df733a7..b76547c426a6 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -601,7 +601,10 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); /* TODO: at least some (those we know) grandfathered tags should be * recognized by the replacement code. */ - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-GB-oed", &aCanonicalized) && aCanonicalized == "en-GB-oed" ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-GB-oed", &aCanonicalized) ); + // en-GB-oed has become deprecated in updated language-subtag-registry database + // (liblangtag 0.5.7) + CPPUNIT_ASSERT( ( aCanonicalized == "en-GB-oxendict" ) || ( aCanonicalized == "en-GB-oed" ) ); #else CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-Latn-DE" ); #endif |