From d1dcb6931884dcf4b8b9a88fa17d19159a95a04c Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Fri, 9 Oct 2020 12:28:44 -0700 Subject: [PATCH] ICU-21249 integrate CLDR release-38-beta2 to ICU trunk --- icu4c/source/data/misc/plurals.txt | 12 ++++++------ icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 4 ++-- icu4j/main/shared/data/testdata.jar | 2 +- .../com/ibm/icu/dev/test/format/PluralRulesTest.java | 5 ++++- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt index 984e3f6eed1..cf03e27b12f 100644 --- 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 index aa28e021e31..ecbd0eac344 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea83333aff1221b4a1bc4a50b804918c56aad55ae8a903f47ca3756755320ad -size 13270780 +oid sha256:d2f7f3bb8c5ba30b965dddbe2432c00b72087f9b72998b501a80108ad38d76e7 +size 13270764 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 976c41b854a..46e42568844 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfdd84a12ca6f1a4e832cbaff1f5b8e7b95aee3d328757b79c91bc2e61bd25f0 -size 94628 +oid sha256:6ce58e5a64fd5059164b21402d00bc19d8842f429db7a518dd8933c9044ddb8e +size 94643 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 9bb72b552f3..525abbe535a 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b78af15fc6e50892ddbbaf7c2c86545b12cf5319888cec2a7d3a7bc10faa8ff8 +oid sha256:b783eeb37f9f408a3698a2abd754175f0ed442bae781d01b662d61896691fd48 size 723507 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 index 6d241ac4be9..bca6fc99e32 100644 --- 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 class PluralRulesTest extends TestFmwk { } 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); -- 2.40.0