diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-19 13:07:09 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-19 13:08:29 +0200 |
| commit | 99899543ee59b9753bfbcea565fd678b5f4f7f0f (patch) | |
| tree | 2e1d890304c358fccdd515bc79150252e742d400 /i18nlangtag | |
| parent | 1eccc6dedf5710cf3009c15fcbe1b44a8dd393fb (diff) | |
accept (DIGIT 3*ALNUM) variant in place of (4*ALPHA) script
Change-Id: If622619bd2e282ab8298ac8a29f8bb57a8fe968f
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 20 | ||||
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 26 |
2 files changed, 38 insertions, 8 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 9f7c7970881a..079973e38fd6 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -318,6 +318,24 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( de_DE.getLanguageType() == LANGUAGE_GERMAN ); } + // 'de-1901' derived from 'de-DE-1901' grandfathered to check that it is + // accepted as (DIGIT 3*ALNUM) variant + { + OUString s_de_1901( "de-1901" ); + LanguageTag de_1901( s_de_1901 ); + lang::Locale aLocale = de_1901.getLocale(); + CPPUNIT_ASSERT( de_1901.getBcp47() == s_de_1901 ); + CPPUNIT_ASSERT( aLocale.Language == "qlt" ); + CPPUNIT_ASSERT( aLocale.Country == "" ); + CPPUNIT_ASSERT( aLocale.Variant == s_de_1901 ); + CPPUNIT_ASSERT( de_1901.getLanguageType() == LANGUAGE_SYSTEM ); + CPPUNIT_ASSERT( de_1901.isValidBcp47() == true ); + CPPUNIT_ASSERT( de_1901.isIsoLocale() == false ); + CPPUNIT_ASSERT( de_1901.isIsoODF() == false ); + CPPUNIT_ASSERT( de_1901.getLanguageAndScript() == "de" ); + CPPUNIT_ASSERT( de_1901.getVariants() == "1901" ); + } + // 'en-GB-oed' is known grandfathered for English, Oxford English // Dictionary spelling { @@ -327,7 +345,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( en_GB_oed.getBcp47() == s_en_GB_oed ); CPPUNIT_ASSERT( aLocale.Language == "qlt" ); CPPUNIT_ASSERT( aLocale.Country == "GB" ); // only 'GB' because we handle it, liblangtag would not fill this - CPPUNIT_ASSERT( aLocale.Variant == "en-GB-oed" ); + CPPUNIT_ASSERT( aLocale.Variant == s_en_GB_oed ); CPPUNIT_ASSERT( en_GB_oed.getLanguageType() == LANGUAGE_USER_ENGLISH_UK_OED ); CPPUNIT_ASSERT( en_GB_oed.isValidBcp47() == true ); CPPUNIT_ASSERT( en_GB_oed.isIsoLocale() == false ); diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 20d542bce11a..3aad527727e8 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -1789,16 +1789,28 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp eRet = EXTRACTED_LSC; } } - else if ( (nHyph1 == 2 && nLen == 7) // ll-Ssss - || (nHyph1 == 3 && nLen == 8)) // lll-Ssss + else if ( (nHyph1 == 2 && nLen == 7) // ll-Ssss or ll-vvvv + || (nHyph1 == 3 && nLen == 8)) // lll-Ssss or lll-vvvv { - /* TODO: also accept a (DIGIT 3*ALNUM) vvvv variant instead of Ssss */ if (nHyph2 < 0) { - rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase(); - rScript = rBcp47.copy( nHyph1 + 1, 1).toAsciiUpperCase() + rBcp47.copy( nHyph1 + 2, 3).toAsciiLowerCase(); - rCountry = rVariants = OUString(); - eRet = EXTRACTED_LSC; + sal_Unicode c = rBcp47[nHyph1+1]; + if ('0' <= c && c <= '9') + { + // (DIGIT 3*ALNUM) vvvv variant instead of Ssss script + rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase(); + rScript = rCountry = OUString(); + rVariants = rBcp47.copy( nHyph1 + 1); + eRet = EXTRACTED_LV; + } + else + { + rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase(); + rScript = rBcp47.copy( nHyph1 + 1, 1).toAsciiUpperCase() + + rBcp47.copy( nHyph1 + 2, 3).toAsciiLowerCase(); + rCountry = rVariants = OUString(); + eRet = EXTRACTED_LSC; + } } } else if ( (nHyph1 == 2 && nHyph2 == 7 && nLen == 10) // ll-Ssss-CC |