ICU-9503 Undo removal of lenient parse data. Only English wasn't moved to CLDR.

X-SVN-Rev: 38461

diff --git a/icu4c/source/data/rbnf/en.txt b/icu4c/source/data/rbnf/en.txt
index 104cf97b6e6bb90cae739de38f064088d1a20fe2..b5705b18a5c217133853182747bf11223329b948 100644 (file)
--- a/icu4c/source/data/rbnf/en.txt
+++ b/icu4c/source/data/rbnf/en.txt
@@ -42,6 +42,8 @@ en{
             "0: =#,##0=$(ordinal,one{st}two{nd}few{rd}other{th})$;",
         }
         SpelloutRules{
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
             "%%2d-year:",
             "0: hundred;",
             "1: oh-=%spellout-numbering=;",

diff --git a/icu4c/source/data/xml/rbnf/en.xml b/icu4c/source/data/xml/rbnf/en.xml
index b82d7ecb1333e0187e8186406adb8afc3f1b243f..e0754da48645ec9a3b7b1c1d900ced0acc3f0008 100644 (file)
--- a/icu4c/source/data/xml/rbnf/en.xml
+++ b/icu4c/source/data/xml/rbnf/en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
- Copyright (c) 2013-2015 International Business Machines Corporation and others. All rights reserved.
+ Copyright (c) 2013-2016 International Business Machines Corporation and others. All rights reserved.
 -->
 <!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd">
 <ldml>
@@ -43,5 +43,10 @@
                 <rbnfrule value="0">&amp; ':' = '.' = ' ' = '-';</rbnfrule>
             </ruleset>
         </rulesetGrouping>
+        <rulesetGrouping type="SpelloutRules">
+            <ruleset type="lenient-parse" access="private">
+                <rbnfrule value="0">&amp;[last primary ignorable ] ←← ' ' ←← ',' ←← '-' ←← '­';</rbnfrule>
+            </ruleset>
+        </rulesetGrouping>
    </rbnf>
 </ldml>

diff --git a/icu4c/source/test/intltest/itrbnf.cpp b/icu4c/source/test/intltest/itrbnf.cpp
index 937bbee47dc252e405b694fb871dea845167fbe1..037cda10a322a21b1f8462a165d80946fd341b81 100644 (file)
--- a/icu4c/source/test/intltest/itrbnf.cpp
+++ b/icu4c/source/test/intltest/itrbnf.cpp
@@ -1166,9 +1166,8 @@ IntlTestRBNF::TestEnglishSpellout()
         doTest(formatter, testData, TRUE);
 
 #if !UCONFIG_NO_COLLATION
-        if( !logKnownIssue("9503") ) {
-          formatter->setLenient(TRUE);
-          static const char* lpTestData[][2] = {
+        formatter->setLenient(TRUE);
+        static const char* lpTestData[][2] = {
             { "fifty-7", "57" },
             { " fifty-7", "57" },
             { "  fifty-7", "57" },
@@ -1176,9 +1175,8 @@ IntlTestRBNF::TestEnglishSpellout()
             { "fifteen hundred and zero", "1,500" },
             { "FOurhundred     thiRTY six", "436" },
             { NULL, NULL}
-          };
-          doLenientParseTest(formatter, lpTestData);
-        }
+        };
+        doLenientParseTest(formatter, lpTestData);
 #endif
     }
     delete formatter;