[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx    |    5 +++++
 i18nlangtag/source/languagetag/languagetag.cxx |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit 7dc7d77cd0b142ea3fde93368334d1e4909d94da
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 10 19:16:33 2013 +0200

    include language-only in ISO-only fallback strings
    
    Change-Id: I6da1b2b46c724c72bff3b1ee9739f2625a0321c2

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 6fb0de2..5ddc9b8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -209,6 +209,11 @@ void TestLanguageTag::testAllTags()
         CPPUNIT_ASSERT( de_DE.getCountry() == "DE" );
         CPPUNIT_ASSERT( de_DE.getScript() == "" );
         CPPUNIT_ASSERT( de_DE.getLanguageAndScript() == "de" );
+        ::std::vector< OUString > de_DE_Fallbacks( de_DE.getFallbackStrings( true));
+        CPPUNIT_ASSERT( de_DE_Fallbacks.size() == 2);
+        CPPUNIT_ASSERT( de_DE_Fallbacks[0] == "de-DE");
+        CPPUNIT_ASSERT( de_DE_Fallbacks[1] == "de");
+        CPPUNIT_ASSERT( de_DE.makeFallback().getBcp47() == "de-DE");
     }
 
     {
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 40098a9..b356833 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1238,6 +1238,7 @@ LanguageTag & LanguageTag::makeFallback()
                 else if (aCountry != "CN")
                     aVec.push_back( aLanguage + "-CN");
             }
+            aVec.push_back( aLanguage);
         }
         else if (bIncludeFullBcp47)
             aVec.push_back( aLanguage);