ICU-21261 Adds 'units' data to pseudolocale data generation. Also corrects the docume...

diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index 89d90b625719b132711fd1176743745470bed333..ffd49a9cc9495c2c4c634cd950a2e440b4cc6198 100644 (file)
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -122,7 +122,7 @@
 # 1a. Java and ant variables, adjust for your system
 
 export JAVA_HOME=`/usr/libexec/java_home`
-export ANT_OPTS="-Xmx4096m
+export ANT_OPTS="-Xmx4096m"
 
 # 1b. CLDR variables, adjust for your setup; with cygwin it might be e.g.
 # CLDR_DIR=`cygpath -wp /build/cldr`

diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PseudoLocales.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PseudoLocales.java
index 1e11e689b15a277a44689fb21b35ed1bcd3be201..ab7d2e1006bc84a496160ef5d68ba62df24a6f28 100644 (file)
--- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PseudoLocales.java
+++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PseudoLocales.java
@@ -191,8 +191,7 @@ public final class PseudoLocales {
             ldml("numbers/defaultNumberingSystem");
 
         // These paths were mostly derived from looking at the previous implementation's behaviour
-        // and can be modified as needed. Notably there are no "units" here (but they were also
-        // excluded in the original code).
+        // and can be modified as needed.
         private static final Predicate<CldrPath> IS_PSEUDO_PATH =
             matchAnyLdmlPrefix(
                 "localeDisplayNames",
@@ -203,7 +202,8 @@ public final class PseudoLocales {
                 "listPatterns",
                 "posix/messages",
                 "characterLabels",
-                "typographicNames")
+                "typographicNames",
+                "units")
                 .and(matchAnyLdmlPrefix(
                     "localeDisplayNames/localeDisplayPattern",
                     "dates/timeZoneNames/fallbackFormat")

diff --git a/tools/cldr/lib/README.txt b/tools/cldr/lib/README.txt
index abd9b2b0ffd09e876947550f356bdc5877d0cc7a..be0fcf350fae2c38c7afe9dfc39d66859629289d 100644 (file)
--- a/tools/cldr/lib/README.txt
+++ b/tools/cldr/lib/README.txt
@@ -29,7 +29,7 @@ Installing the CLDR API jar
 
 From this directory:
 
-$ ./install-cldr-jars.sh "$CLDR_ROOT"
+$ ./install-cldr-jars.sh "$CLDR_DIR"
 
 
 Manually installing the CLDR API jar