summaryrefslogtreecommitdiff
path: root/i18nlangtag
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-07-08 09:48:46 +0200
committerDavid Tardon <dtardon@redhat.com>2015-07-08 09:49:14 +0200
commitb43fde69caf456585004b3e1da5161d76eadf057 (patch)
tree52b93c249208f5fe0e2c52067ff4f0a3168bf796 /i18nlangtag
parentd29aeee806991a1439697c255b95db111230e262 (diff)
fix langtag test with liblangtag 0.5.7
Change-Id: Ic8639daa5a32cf98fa17903424b00916cb6d8c6f
Diffstat (limited to 'i18nlangtag')
-rw-r--r--i18nlangtag/qa/cppunit/test_languagetag.cxx5
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