ICU-20796 integrate CLDR release-36-beta

weiyiqianlima · Sep 27, 2019 · 33ca188 · 33ca188
1 parent dc4dfd2
commit 33ca188
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
@@ -58,6 +58,13 @@
 # CLDR_TMP_DIR:  Parent of temporary CLDR production data.
 #                Defaults to $CLDR_DIR/../cldr-aux (sibling to CLDR_DIR).
 #
+#                *** NOTE ***: In CLDR release-36-beta, the GenerateProductionData
+#                tool no longer generates data into $CLDR_TMP_DIR/production; instead
+#                it generates data into $CLDR_DIR/../cldr-staging/production. However
+#                the rest of the build still assumes that the generated data is in
+#                $CLDR_TMP_DIR/production. So CLDR_TMP_DIR must be defined to be
+#                $CLDR_DIR/../cldr-staging
+#
 # c) ICU-related variables
 # These variables only need to be set if you're directly reusing the
 # commands below.

diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt
@@ -2131,6 +2131,10 @@ metadata:table(nofallback){
                 reason{"overlong"}
                 replacement{"SX"}
             }
+            no23{
+                reason{"deprecated"}
+                replacement{"no50"}
+            }
             nzn{
                 reason{"deprecated"}
                 replacement{"nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko"}

diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
@@ -23120,7 +23120,7 @@ supplementalData:table(nofallback){
             "no20",
             "no21",
             "no22",
-            "no23",
+            "no50",
         }
         NP{
             "np1",
@@ -25653,12 +25653,6 @@ supplementalData:table(nofallback){
             "itvi",
             "itvr",
         }
-        it36{
-            "itgo",
-            "itpn",
-            "itts",
-            "itud",
-        }
         it42{
             "itge",
             "itim",
@@ -25755,13 +25749,10 @@ supplementalData:table(nofallback){
         }
         it88{
             "itca",
-            "itci",
             "itnu",
-            "itog",
             "itor",
-            "itot",
+            "itsd",
             "itss",
-            "itvs",
         }
         knk{
             "kn01",
@@ -25861,6 +25852,7 @@ supplementalData:table(nofallback){
             "manou",
             "marab",
             "masal",
+            "masik",
             "masil",
             "maskh",
         }
@@ -25874,12 +25866,13 @@ supplementalData:table(nofallback){
         ma06{
             "mabes",
             "mabrr",
+            "macas",
             "macht",
             "majdi",
             "mamed",
             "mamoh",
+            "maset",
             "masib",
-            "masik",
         }
         ma07{
             "machi",
@@ -25892,11 +25885,9 @@ supplementalData:table(nofallback){
             "mayus",
         }
         ma08{
-            "macas",
             "maerr",
             "mamid",
             "maoua",
-            "maset",
             "matin",
             "mazag",
         }

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