Kaydet (Commit) 198cea3b authored tarafından Eike Rathke's avatar Eike Rathke Kaydeden (comit) Andras Timar

update to language-subtag-registry as of 2015-06-08

(cherry picked from commit 712c4c6e)

fix langtag test with liblangtag 0.5.7

(cherry picked from commit b43fde69)

c8639daa5a32cf98fa17903424b00916cb6d8c6f

Change-Id: I05ad85ea8d852ef2531db76fa6a79aa068c1699c
Reviewed-on: https://gerrit.libreoffice.org/16904Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
üst 2a167364
......@@ -82,8 +82,8 @@ export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7
export JPEG_TARBALL := jpegsrc.v9a.tar.gz
export JPEG_TURBO_MD5SUM := 2c3a68129dac443a72815ff5bb374b05
export JPEG_TURBO_TARBALL := libjpeg-turbo-1.3.1.tar.gz
export LANGTAGREG_MD5SUM := 0f2677ec23bb43ddc7355d1b4cc8ed45
export LANGTAGREG_TARBALL := language-subtag-registry-2014-12-03.tar.bz2
export LANGTAGREG_MD5SUM := d431bd8a70455be1fa8523fa633c005b
export LANGTAGREG_TARBALL := language-subtag-registry-2015-06-08.tar.bz2
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33
export LCMS2_TARBALL := lcms2-2.6.tar.gz
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment