ICU-20210 ICU-20211 Cherry-pick fixes from CLDR to unblock exhaustive tests.

Cherry-pick cldrbug 11492: Bad symbols for NaN in sv, ksh, kl, se locales.
Cherry-pick cldrbug 11491: sd, month name for July uses character not in exemplars.
Updated the various ICU4J *.jar files as well.

diff --git a/icu4c/source/data/locales/kl.txt b/icu4c/source/data/locales/kl.txt
index 2b97ba809dbb462aaff9eeed1c1a8a49af1e0a64..c0895c583ee922f6c8538f021a8a29927927a9bc 100644 (file)
--- a/icu4c/source/data/locales/kl.txt
+++ b/icu4c/source/data/locales/kl.txt
@@ -16,6 +16,7 @@ kl{
             symbols{
                 decimal{","}
                 group{"."}
+                nan{"NaN"}
             }
         }
         minimalPairs{

diff --git a/icu4c/source/data/locales/ksh.txt b/icu4c/source/data/locales/ksh.txt
index 9b53885bff5801db4b046365807a75d4ba5b0997..e350b5ad204f99743bf046bb7445d6f87e5fc696 100644 (file)
--- a/icu4c/source/data/locales/ksh.txt
+++ b/icu4c/source/data/locales/ksh.txt
@@ -153,7 +153,7 @@ ksh{
                 infinity{"∞"}
                 list{";"}
                 minusSign{"−"}
-                nan{"¤¤¤"}
+                nan{"NaN"}
                 perMille{"‰"}
                 percentSign{"%"}
                 plusSign{"+"}

diff --git a/icu4c/source/data/locales/sd.txt b/icu4c/source/data/locales/sd.txt
index bbe154a138f94bdb54f3ce61ef911836d3b60fd1..b6eaa6ed27633abfdcc7befbe97cb88fbae4d689 100644 (file)
--- a/icu4c/source/data/locales/sd.txt
+++ b/icu4c/source/data/locales/sd.txt
@@ -12,11 +12,11 @@ sd{
     }
     ExemplarCharacters{
         "[آ ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ "
-        "Ù\81 Ú¦ Ù\82 Ú© Úª Ú¯ {Ú¯Ú¾} Ú± Ú³ Ù\84 Ù\85 Ù\86 Ú» Ù\87 Ú¾ Ù\88 ي]"
+        "Ù\81 Ú¦ Ù\82 Ú© Úª Ú¯ {Ú¯Ú¾} Ú± Ú³ Ù\84 Ù\85 Ù\86 Ú» Ù\88 Ù\87 Ú¾ Ø¡ ي]"
     }
     ExemplarCharactersIndex{
         "[ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف "
-        "Ú¦ Ù\82 Ú© Úª Ú¯ {Ú¯Ú¾} Ú± Ú³ Ù\84 Ù\85 Ù\86 Ú» Ù\87 Ú¾ Ù\88 ي]"
+        "Ú¦ Ù\82 Ú© Úª Ú¯ {Ú¯Ú¾} Ú± Ú³ Ù\84 Ù\85 Ù\86 Ú» Ù\88 Ù\87 Ú¾ ي]"
     }
     ExemplarCharactersNumbers{"[\\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"}
     ExemplarCharactersPunctuation{"[⹁ ⁏ \\: ! ۔ ‘ ( ) \\[ \\] \\{ \\} /]"}

diff --git a/icu4c/source/data/locales/se.txt b/icu4c/source/data/locales/se.txt
index f91835d02a25580e5d185377de8bcb5cadb8dba5..f96c79c927294c149f28c9e5582dd960d1e31dc4 100644 (file)
--- a/icu4c/source/data/locales/se.txt
+++ b/icu4c/source/data/locales/se.txt
@@ -156,7 +156,7 @@ se{
                 infinity{"∞"}
                 list{";"}
                 minusSign{"−"}
-                nan{"¤¤¤"}
+                nan{"NaN"}
                 perMille{"‰"}
                 percentSign{"%"}
                 plusSign{"+"}

diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt
index 8e8bc934943e8846ba1fecb8b8be764c1f8652cf..6b9b2e538c6d65fbd3cb95f1d4bf01563d4d7d00 100644 (file)
--- a/icu4c/source/data/locales/sv.txt
+++ b/icu4c/source/data/locales/sv.txt
@@ -27,7 +27,7 @@ sv{
                 infinity{"∞"}
                 list{"؛"}
                 minusSign{"؜−"}
-                nan{"¤¤¤"}
+                nan{"NaN"}
                 perMille{"؉‏"}
                 percentSign{"٪؜"}
                 plusSign{"؜+"}
@@ -43,7 +43,7 @@ sv{
                 infinity{"∞"}
                 list{"؛"}
                 minusSign{"‎−‎"}
-                nan{"¤¤¤"}
+                nan{"NaN"}
                 perMille{"؉"}
                 percentSign{"٪"}
                 plusSign{"‎+‎"}
@@ -232,7 +232,7 @@ sv{
                 infinity{"∞"}
                 list{";"}
                 minusSign{"−"}
-                nan{"¤¤¤"}
+                nan{"NaN"}
                 perMille{"‰"}
                 percentSign{"%"}
                 plusSign{"+"}

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 2ebb1d414e5dc6628ac10bb2cbd8b95a33664336..a91910f095b7966867d15e235e42a83492c93d24 100644 (file)
--- 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:4c2cf8d3a5c972b98d25c9091e23edb0dbdb856d25ce01063bc8a10030122b47
-size 12699908
+oid sha256:fa392798700da05ef99e1f222f4b5854d135a89fdf63fe4ce59c9eecd05b3754
+size 12698096

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index aabfe5762cd2f2d68249742283fd136207c86caf..421dc716feefd31f892c8178e513d9cb26a41858 100644 (file)
--- 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:9e8b58bfaaf6e5d236337ee6bc0a7aee7dcb32e5d7054a8bd584650416490d2f
+oid sha256:5ac6d5dcf27192d2c1446cda747ec795a526c2603aad41b03130ffb9650e6ec1
 size 94059

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 32242c380746ed6d8a7d81eebe7f4355cf358a3a..2737d5ee0781ee1093a54d5305e7e455038e6973 100644 (file)
--- 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:04c3b18b052ae1ff747b8fb336b89c34085c3823e0f46bc3edd66889e41beda3
-size 813585
+oid sha256:00ce84fd2fa0a741f07cab7bb17a86e70430be09bbc43f01fcc4f29a06eca2ee
+size 725933