diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-04 12:15:33 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-04 12:27:10 +0200 |
| commit | 8d4cd0751516631bcd5c6fabf1eb07d64bb72f17 (patch) | |
| tree | c07355cdd1d659c7830d2ed6d598218553d080ad /i18nlangtag/qa | |
| parent | e68074d62b3245f590948ecec8d2f1786708f381 (diff) | |
renamed ca-XV to ca-valencia and activated ca-ES-valencia, fdo#59867 related
Build Catalan-Valencian as ca-valencia instead of ca-XV private-use.
Introduced LANGUAGE_CATALAN_VALENCIAN 0x0803 mapping to ca-ES-valencia,
preserving old ca-XV and qcv-ES mappings to now
LANGUAGE_CATALAN_VALENCIAN and LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN
0x8003 to ca-ES-valencia.
Removed special !bUserInterfaceSelection treatment from
MsLangId::getReplacementForObsoleteLanguage() and added the usual
obsolete replacement instead.
Change-Id: I2fdd8b0bac55d4b4ae2cbf3c3645f09fefec9b6e
Diffstat (limited to 'i18nlangtag/qa')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 915d5cbcc84e..d0145cf7d126 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -153,12 +153,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( aLocale.Language == "qlt" ); CPPUNIT_ASSERT( aLocale.Country == "ES" ); CPPUNIT_ASSERT( aLocale.Variant == s_ca_ES_valencia ); - /* TODO: conversion doesn't know this yet, once it does activate test. */ -#if 0 - CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() == LANGUAGE_USER_CATALAN_VALENCIAN ); -#else - CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() == LANGUAGE_SYSTEM ); -#endif + CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() == LANGUAGE_CATALAN_VALENCIAN ); CPPUNIT_ASSERT( ca_ES_valencia.isValidBcp47() == true ); CPPUNIT_ASSERT( ca_ES_valencia.isIsoLocale() == false ); CPPUNIT_ASSERT( ca_ES_valencia.isIsoODF() == false ); @@ -172,12 +167,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == "ca-valencia"); CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == "ca-ES"); CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[3] == "ca"); - /* TODO: conversion doesn't know this yet, once it does activate test. */ -#if 0 CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() == "ca-ES-valencia"); -#else - CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() == "ca-ES"); -#endif } { @@ -200,12 +190,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( ca_valencia_Fallbacks.size() == 2); CPPUNIT_ASSERT( ca_valencia_Fallbacks[0] == "ca-valencia"); CPPUNIT_ASSERT( ca_valencia_Fallbacks[1] == "ca"); - /* TODO: conversion doesn't know this yet, once it does activate test. */ -#if 0 CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() == "ca-ES-valencia"); -#else - CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() == "ca-ES"); -#endif } { |