ICU-21249 integrate CLDR release-38-beta2 to ICU trunk

unicode-org · Oct 9, 2020 · d1dcb69 · d1dcb69
1 parent 0583afe
commit d1dcb69
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt
@@ -460,14 +460,14 @@ plurals:table(nofallback){
         set20{
             many{
                 "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer"
-                " 1000000, 2e6, 3e6, 4e6, 5e6, 6e6, 7e6, … @decimal 2.1e6, 3.1e6, 4.1"
-                "e6, 5.1e6, 6.1e6, 7.1e6, …"
+                " 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, … @decimal 1.0000001e6, 1.1e"
+                "6, 2.0000001e6, 2.1e6, 3.0000001e6, 3.1e6, …"
             }
-            one{"i = 0,1 @integer 0, 1, 1e5 @decimal 0.0~1.5, 1.1e5"}
+            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
             other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 2e5, 3e5, 4e5, 5e5, 6e5, 7"
-                "e5, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000"
-                "000.0, 2.1e5, 3.1e5, 4.1e5, 5.1e5, 6.1e5, 7.1e5, …"
+                " @integer 2~17, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6"
+                "e3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000"
+                "000.0, 1.0001e3, 1.1e3, 2.0001e3, 2.1e3, 3.0001e3, 3.1e3, …"
             }
         }
         set21{

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
@@ -399,7 +399,10 @@ public void testUniqueRules() {
                             }
                             String old = collisionTest.get(item);
                             if (old != null) {
-                                errln(locale + "\tNon-unique rules: " + item + " => " + old + " & " + foundKeyword);
+                                if (!locale.getLanguage().equals("fr") ||
+                                        !logKnownIssue("21328", "fr Non-unique rules: 1e6 => one & many")) {
+                                    errln(locale + "\tNon-unique rules: " + item + " => " + old + " & " + foundKeyword);
+                                }
                                 rule.select(item);
                             } else {
                                 collisionTest.put(item, foundKeyword);