diff --git a/icu4c/source/data/buildtool/locale_dependencies.py b/icu4c/source/data/buildtool/locale_dependencies.py index efbfb88b302..061ef44c087 100644 --- a/icu4c/source/data/buildtool/locale_dependencies.py +++ b/icu4c/source/data/buildtool/locale_dependencies.py @@ -10,11 +10,15 @@ data = { "bs_BA": "bs_Latn_BA", "en_NH": "en_VU", "en_RH": "en_ZW", + "ff_CM": "ff_Latn_CM", + "ff_GN": "ff_Latn_GN", + "ff_MR": "ff_Latn_MR", + "ff_SN": "ff_Latn_SN", "in": "id", "in_ID": "id_ID", "iw": "he", "iw_IL": "he_IL", - "mo": "ro_MD", + "mo": "ro", "no_NO": "nb_NO", "no_NO_NY": "nn_NO", "no": "nb", diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index c96b1b0cd12..6ebd96ed115 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -43,8 +43,8 @@ # http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd # # Unless you cache the dtds locally by -# 1. creating a temp directory e.g. /tmp/cldrdtd -# 2. setting CLDR_DTD_CACHE to it e.g. -DCLDR_DTD_CACHE=/tmp/cldrdtd +# 1. creating a temp directory e.g. ~/.cldrdtd +# 2. setting CLDR_DTD_CACHE to it e.g. -DCLDR_DTD_CACHE=~/.cldrdtd # your system will make excessive network requests, which will result in the # Unicode server blocking access. # @@ -62,7 +62,7 @@ # # -Xmx4096m, to give Java more memory; otherwise it may run out # of heap. -# -DCLDR_DTD_CACHE=/tmp/cldrdtd (or some other temp directory +# -DCLDR_DTD_CACHE=~/.cldrdtd (or some other temp directory # that already exists), to reduce frequent http: access to dtds # and consequent blockage by Unicode server. # @@ -140,8 +140,7 @@ # 1a. Java and ant variables, adjust for your system export JAVA_HOME=`/usr/libexec/java_home` -mkdir -p /tmp/cldrdtd -export ANT_OPTS="-Xmx4096m -DCLDR_DTD_CACHE=/tmp/cldrdtd" +export ANT_OPTS="-Xmx4096m -DCLDR_DTD_CACHE=~/.cldrdtd" # 1b. CLDR variables, adjust for your setup; with cygwin it might be e.g. # CLDR_DIR=`cygpath -wp /build/cldr` @@ -153,6 +152,20 @@ export CLDR_DIR=$HOME/cldr/trunk export ICU4C_DIR=$HOME/icu/icu4c export ICU4J_ROOT=$HOME/icu/icu4j +# 1d. Pre-populate your CLDR DTD cache. You need to do this only once. + +mkdir ~/.cldrdtd +cd ~/.cldrdtd +curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd \ + -o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldml.dtd +# WAIT before hitting the server again; it WILL NOT give you a second chance! +sleep 5 +curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd \ + -o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldmlICU.dtd +sleep 5 +curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlSupplemental.dtd \ + -o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldmlSupplemental.dtd + # 2. Build the CLDR Java tools # Optionally build the jar, but ant will look inside the classes directory anyway @@ -161,14 +174,11 @@ ant all #ant jar # 3. Configure ICU4C, build and test without new data first, to verify that -# there are no pre-existing errors. -# If you do not want to re-run configure and make in step 12 below, then define -# ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data here in order to generate the -# unicore data needed for the ICU4J jars. Here is the runConfigureICU +# there are no pre-existing errors. Here is the runConfigureICU # code for the platform you are building, e.g. Linux, MacOSX, Cygwin. cd $ICU4C_DIR/source -ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU +./runConfigureICU make all 2>&1 | tee /tmp/icu4c-oldData-makeAll.txt make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt @@ -188,6 +198,11 @@ make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt # a dtd cache and are still having timeout problems, the IP address of your system # may have been blocked due to previous excessive access. In this case you may need # to contact a Unicode sysadmin to restore access. +# +# Unfortunately, even if you have your DTD cache variable enabled, you may still +# get blocked and unable to populate your cache because of multiple successive +# requests to download the required DTD files. It is recommended that you +# pre-populate your cache as shown above in step 1d. cd $ICU4C_DIR/source/data ant setup @@ -213,8 +228,9 @@ git status # Again, keep a log so you can investigate the errors. cd $ICU4C_DIR/source -# 7a. NEW: This now requires re-doing runConfigureICU -ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU +# 7a. If any files were added or removed (likely), re-run configure: +./runConfigureICU +make clean # 7b. Now do the rebuild. make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt @@ -252,19 +268,16 @@ ant check 2>&1 | tee /tmp/icu4j-oldData-antCheck.txt # 12. Transfer the data to ICU4J: cd $ICU4C_DIR/source -# 12a. If you did not do configure ICU4C this way in step 3, do it now: +# 12a. You need to reconfigure ICU4C to include the unicore data. ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU # 12b. Now build the jar files. cd $ICU4C_DIR/source/data -# The following 2 lines are optional for a clean rebuild: +# The following 2 lines are required to include the unicore data: make clean make -j6 make icu4j-data-install cd $ICU4C_DIR/source/test/testdata -# The following 2 lines are optional for a clean rebuild: - make clean - make -j6 make icu4j-data-install # 13. Now rebuild ICU4J with the new data and run tests: diff --git a/icu4c/source/data/coll/mo.txt b/icu4c/source/data/coll/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/coll/mo.txt +++ b/icu4c/source/data/coll/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/curr/ff_CM.txt b/icu4c/source/data/curr/ff_CM.txt new file mode 100644 index 00000000000..c381f6cd740 --- /dev/null +++ b/icu4c/source/data/curr/ff_CM.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_CM{ + "%%ALIAS"{"ff_Latn_CM"} +} diff --git a/icu4c/source/data/curr/ff_GN.txt b/icu4c/source/data/curr/ff_GN.txt index 1ab9c17eeff..c3a0bf3d7bf 100644 --- a/icu4c/source/data/curr/ff_GN.txt +++ b/icu4c/source/data/curr/ff_GN.txt @@ -1,11 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_GN{ - Currencies{ - GNF{ - "FG", - "GNF", - } - } - Version{"2.1.48.67"} + "%%ALIAS"{"ff_Latn_GN"} } diff --git a/icu4c/source/data/coll/ro_MD.txt b/icu4c/source/data/curr/ff_Latn_CM.txt similarity index 93% rename from icu4c/source/data/coll/ro_MD.txt rename to icu4c/source/data/curr/ff_Latn_CM.txt index 44f810a5ed4..a141c2f858f 100644 --- a/icu4c/source/data/coll/ro_MD.txt +++ b/icu4c/source/data/curr/ff_Latn_CM.txt @@ -3,6 +3,6 @@ /** * generated alias target */ -ro_MD{ +ff_Latn_CM{ ___{""} } diff --git a/icu4c/source/data/zone/ro_MD.txt b/icu4c/source/data/curr/ff_Latn_SN.txt similarity index 93% rename from icu4c/source/data/zone/ro_MD.txt rename to icu4c/source/data/curr/ff_Latn_SN.txt index 44f810a5ed4..6112f6fdf10 100644 --- a/icu4c/source/data/zone/ro_MD.txt +++ b/icu4c/source/data/curr/ff_Latn_SN.txt @@ -3,6 +3,6 @@ /** * generated alias target */ -ro_MD{ +ff_Latn_SN{ ___{""} } diff --git a/icu4c/source/data/curr/ff_MR.txt b/icu4c/source/data/curr/ff_MR.txt index 4355c3b7273..17a887321fa 100644 --- a/icu4c/source/data/curr/ff_MR.txt +++ b/icu4c/source/data/curr/ff_MR.txt @@ -1,11 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_MR{ - Currencies{ - MRU{ - "UM", - "Ugiyya Muritani", - } - } - Version{"2.1.48.67"} + "%%ALIAS"{"ff_Latn_MR"} } diff --git a/icu4c/source/data/curr/ff_SN.txt b/icu4c/source/data/curr/ff_SN.txt new file mode 100644 index 00000000000..c6908546784 --- /dev/null +++ b/icu4c/source/data/curr/ff_SN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_SN{ + "%%ALIAS"{"ff_Latn_SN"} +} diff --git a/icu4c/source/data/curr/mo.txt b/icu4c/source/data/curr/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/curr/mo.txt +++ b/icu4c/source/data/curr/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/lang/ff_CM.txt b/icu4c/source/data/lang/ff_CM.txt new file mode 100644 index 00000000000..c381f6cd740 --- /dev/null +++ b/icu4c/source/data/lang/ff_CM.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_CM{ + "%%ALIAS"{"ff_Latn_CM"} +} diff --git a/icu4c/source/data/lang/ff_GN.txt b/icu4c/source/data/lang/ff_GN.txt new file mode 100644 index 00000000000..c3a0bf3d7bf --- /dev/null +++ b/icu4c/source/data/lang/ff_GN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_GN{ + "%%ALIAS"{"ff_Latn_GN"} +} diff --git a/icu4c/source/data/lang/ff_Latn_CM.txt b/icu4c/source/data/lang/ff_Latn_CM.txt new file mode 100644 index 00000000000..a141c2f858f --- /dev/null +++ b/icu4c/source/data/lang/ff_Latn_CM.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_CM{ + ___{""} +} diff --git a/icu4c/source/data/lang/ff_Latn_GN.txt b/icu4c/source/data/lang/ff_Latn_GN.txt new file mode 100644 index 00000000000..b37284e2b02 --- /dev/null +++ b/icu4c/source/data/lang/ff_Latn_GN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_GN{ + ___{""} +} diff --git a/icu4c/source/data/lang/ff_Latn_MR.txt b/icu4c/source/data/lang/ff_Latn_MR.txt new file mode 100644 index 00000000000..9b83c951109 --- /dev/null +++ b/icu4c/source/data/lang/ff_Latn_MR.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_MR{ + ___{""} +} diff --git a/icu4c/source/data/lang/ff_Latn_SN.txt b/icu4c/source/data/lang/ff_Latn_SN.txt new file mode 100644 index 00000000000..6112f6fdf10 --- /dev/null +++ b/icu4c/source/data/lang/ff_Latn_SN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_SN{ + ___{""} +} diff --git a/icu4c/source/data/lang/ff_MR.txt b/icu4c/source/data/lang/ff_MR.txt new file mode 100644 index 00000000000..17a887321fa --- /dev/null +++ b/icu4c/source/data/lang/ff_MR.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_MR{ + "%%ALIAS"{"ff_Latn_MR"} +} diff --git a/icu4c/source/data/lang/ff_SN.txt b/icu4c/source/data/lang/ff_SN.txt new file mode 100644 index 00000000000..c6908546784 --- /dev/null +++ b/icu4c/source/data/lang/ff_SN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_SN{ + "%%ALIAS"{"ff_Latn_SN"} +} diff --git a/icu4c/source/data/lang/mo.txt b/icu4c/source/data/lang/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/lang/mo.txt +++ b/icu4c/source/data/lang/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/locales/ff_CM.txt b/icu4c/source/data/locales/ff_CM.txt index 954259477e4..c381f6cd740 100644 --- a/icu4c/source/data/locales/ff_CM.txt +++ b/icu4c/source/data/locales/ff_CM.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_CM{ - Version{"2.1.48.67"} + "%%ALIAS"{"ff_Latn_CM"} } diff --git a/icu4c/source/data/locales/ff_GN.txt b/icu4c/source/data/locales/ff_GN.txt index 93b39a73a48..c3a0bf3d7bf 100644 --- a/icu4c/source/data/locales/ff_GN.txt +++ b/icu4c/source/data/locales/ff_GN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_GN{ - Version{"2.1.48.67"} + "%%ALIAS"{"ff_Latn_GN"} } diff --git a/icu4c/source/data/locales/ff_MR.txt b/icu4c/source/data/locales/ff_MR.txt index af3c375fe74..17a887321fa 100644 --- a/icu4c/source/data/locales/ff_MR.txt +++ b/icu4c/source/data/locales/ff_MR.txt @@ -1,24 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_MR{ - Version{"2.1.48.67"} - calendar{ - gregorian{ - DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM y", - "d MMMM y", - "d MMM, y", - "d/M/y", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - } - } - } + "%%ALIAS"{"ff_Latn_MR"} } diff --git a/icu4c/source/data/locales/ff_SN.txt b/icu4c/source/data/locales/ff_SN.txt index ae29195e9eb..c6908546784 100644 --- a/icu4c/source/data/locales/ff_SN.txt +++ b/icu4c/source/data/locales/ff_SN.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ff_SN{ - Version{"2.1.48.67"} + "%%ALIAS"{"ff_Latn_SN"} } diff --git a/icu4c/source/data/locales/mo.txt b/icu4c/source/data/locales/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/locales/mo.txt +++ b/icu4c/source/data/locales/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/region/ff_CM.txt b/icu4c/source/data/region/ff_CM.txt new file mode 100644 index 00000000000..c381f6cd740 --- /dev/null +++ b/icu4c/source/data/region/ff_CM.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_CM{ + "%%ALIAS"{"ff_Latn_CM"} +} diff --git a/icu4c/source/data/region/ff_GN.txt b/icu4c/source/data/region/ff_GN.txt new file mode 100644 index 00000000000..c3a0bf3d7bf --- /dev/null +++ b/icu4c/source/data/region/ff_GN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_GN{ + "%%ALIAS"{"ff_Latn_GN"} +} diff --git a/icu4c/source/data/region/ff_Latn_CM.txt b/icu4c/source/data/region/ff_Latn_CM.txt new file mode 100644 index 00000000000..a141c2f858f --- /dev/null +++ b/icu4c/source/data/region/ff_Latn_CM.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_CM{ + ___{""} +} diff --git a/icu4c/source/data/region/ff_Latn_GN.txt b/icu4c/source/data/region/ff_Latn_GN.txt new file mode 100644 index 00000000000..b37284e2b02 --- /dev/null +++ b/icu4c/source/data/region/ff_Latn_GN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_GN{ + ___{""} +} diff --git a/icu4c/source/data/region/ff_Latn_MR.txt b/icu4c/source/data/region/ff_Latn_MR.txt new file mode 100644 index 00000000000..9b83c951109 --- /dev/null +++ b/icu4c/source/data/region/ff_Latn_MR.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_MR{ + ___{""} +} diff --git a/icu4c/source/data/region/ff_Latn_SN.txt b/icu4c/source/data/region/ff_Latn_SN.txt new file mode 100644 index 00000000000..6112f6fdf10 --- /dev/null +++ b/icu4c/source/data/region/ff_Latn_SN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_SN{ + ___{""} +} diff --git a/icu4c/source/data/region/ff_MR.txt b/icu4c/source/data/region/ff_MR.txt new file mode 100644 index 00000000000..17a887321fa --- /dev/null +++ b/icu4c/source/data/region/ff_MR.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_MR{ + "%%ALIAS"{"ff_Latn_MR"} +} diff --git a/icu4c/source/data/region/ff_SN.txt b/icu4c/source/data/region/ff_SN.txt new file mode 100644 index 00000000000..c6908546784 --- /dev/null +++ b/icu4c/source/data/region/ff_SN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_SN{ + "%%ALIAS"{"ff_Latn_SN"} +} diff --git a/icu4c/source/data/region/mo.txt b/icu4c/source/data/region/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/region/mo.txt +++ b/icu4c/source/data/region/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/unit/ff_CM.txt b/icu4c/source/data/unit/ff_CM.txt new file mode 100644 index 00000000000..c381f6cd740 --- /dev/null +++ b/icu4c/source/data/unit/ff_CM.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_CM{ + "%%ALIAS"{"ff_Latn_CM"} +} diff --git a/icu4c/source/data/unit/ff_GN.txt b/icu4c/source/data/unit/ff_GN.txt new file mode 100644 index 00000000000..c3a0bf3d7bf --- /dev/null +++ b/icu4c/source/data/unit/ff_GN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_GN{ + "%%ALIAS"{"ff_Latn_GN"} +} diff --git a/icu4c/source/data/unit/ff_Latn_CM.txt b/icu4c/source/data/unit/ff_Latn_CM.txt new file mode 100644 index 00000000000..a141c2f858f --- /dev/null +++ b/icu4c/source/data/unit/ff_Latn_CM.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_CM{ + ___{""} +} diff --git a/icu4c/source/data/unit/ff_Latn_GN.txt b/icu4c/source/data/unit/ff_Latn_GN.txt new file mode 100644 index 00000000000..b37284e2b02 --- /dev/null +++ b/icu4c/source/data/unit/ff_Latn_GN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_GN{ + ___{""} +} diff --git a/icu4c/source/data/unit/ff_Latn_MR.txt b/icu4c/source/data/unit/ff_Latn_MR.txt new file mode 100644 index 00000000000..9b83c951109 --- /dev/null +++ b/icu4c/source/data/unit/ff_Latn_MR.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_MR{ + ___{""} +} diff --git a/icu4c/source/data/unit/ff_Latn_SN.txt b/icu4c/source/data/unit/ff_Latn_SN.txt new file mode 100644 index 00000000000..6112f6fdf10 --- /dev/null +++ b/icu4c/source/data/unit/ff_Latn_SN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_SN{ + ___{""} +} diff --git a/icu4c/source/data/unit/ff_MR.txt b/icu4c/source/data/unit/ff_MR.txt new file mode 100644 index 00000000000..17a887321fa --- /dev/null +++ b/icu4c/source/data/unit/ff_MR.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_MR{ + "%%ALIAS"{"ff_Latn_MR"} +} diff --git a/icu4c/source/data/unit/ff_SN.txt b/icu4c/source/data/unit/ff_SN.txt new file mode 100644 index 00000000000..c6908546784 --- /dev/null +++ b/icu4c/source/data/unit/ff_SN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_SN{ + "%%ALIAS"{"ff_Latn_SN"} +} diff --git a/icu4c/source/data/unit/mo.txt b/icu4c/source/data/unit/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/unit/mo.txt +++ b/icu4c/source/data/unit/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4c/source/data/zone/ff_CM.txt b/icu4c/source/data/zone/ff_CM.txt new file mode 100644 index 00000000000..c381f6cd740 --- /dev/null +++ b/icu4c/source/data/zone/ff_CM.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_CM{ + "%%ALIAS"{"ff_Latn_CM"} +} diff --git a/icu4c/source/data/zone/ff_GN.txt b/icu4c/source/data/zone/ff_GN.txt new file mode 100644 index 00000000000..c3a0bf3d7bf --- /dev/null +++ b/icu4c/source/data/zone/ff_GN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_GN{ + "%%ALIAS"{"ff_Latn_GN"} +} diff --git a/icu4c/source/data/zone/ff_Latn_CM.txt b/icu4c/source/data/zone/ff_Latn_CM.txt new file mode 100644 index 00000000000..a141c2f858f --- /dev/null +++ b/icu4c/source/data/zone/ff_Latn_CM.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_CM{ + ___{""} +} diff --git a/icu4c/source/data/zone/ff_Latn_GN.txt b/icu4c/source/data/zone/ff_Latn_GN.txt new file mode 100644 index 00000000000..b37284e2b02 --- /dev/null +++ b/icu4c/source/data/zone/ff_Latn_GN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_GN{ + ___{""} +} diff --git a/icu4c/source/data/zone/ff_Latn_MR.txt b/icu4c/source/data/zone/ff_Latn_MR.txt new file mode 100644 index 00000000000..9b83c951109 --- /dev/null +++ b/icu4c/source/data/zone/ff_Latn_MR.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_MR{ + ___{""} +} diff --git a/icu4c/source/data/zone/ff_Latn_SN.txt b/icu4c/source/data/zone/ff_Latn_SN.txt new file mode 100644 index 00000000000..6112f6fdf10 --- /dev/null +++ b/icu4c/source/data/zone/ff_Latn_SN.txt @@ -0,0 +1,8 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +/** + * generated alias target + */ +ff_Latn_SN{ + ___{""} +} diff --git a/icu4c/source/data/zone/ff_MR.txt b/icu4c/source/data/zone/ff_MR.txt new file mode 100644 index 00000000000..17a887321fa --- /dev/null +++ b/icu4c/source/data/zone/ff_MR.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_MR{ + "%%ALIAS"{"ff_Latn_MR"} +} diff --git a/icu4c/source/data/zone/ff_SN.txt b/icu4c/source/data/zone/ff_SN.txt new file mode 100644 index 00000000000..c6908546784 --- /dev/null +++ b/icu4c/source/data/zone/ff_SN.txt @@ -0,0 +1,5 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +ff_SN{ + "%%ALIAS"{"ff_Latn_SN"} +} diff --git a/icu4c/source/data/zone/mo.txt b/icu4c/source/data/zone/mo.txt index 64025913d72..01049c8f3c8 100644 --- a/icu4c/source/data/zone/mo.txt +++ b/icu4c/source/data/zone/mo.txt @@ -1,5 +1,5 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License mo{ - "%%ALIAS"{"ro_MD"} + "%%ALIAS"{"ro"} } diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 5706bcdef72..23fe3bb981a 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:f5c4f0d2ae6d62092eead5171c68c492e26882724c1d36e1b8bae11b9751788e -size 14112126 +oid sha256:b96976c9a34d2c58b73d955edb43d725e66c6c61ca1197cc22b3f1bcad220459 +size 12818509 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index ec72a994365..a7863682f77 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:640e2f8cc8e92949262848cbfa9fef63503e989717a4d4c36391fb8db79acb12 -size 94046 +oid sha256:b6e98819b735c51653941d402d794ffe62bb2f02fbaba03d29e3ea76ed7cd1ee +size 94044 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 75f41e6deb5..8f99ec12549 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:5b547e9bf978237e62bb995dbf5389615a9043844d8d24ce580531dea9ba00fd -size 723410 +oid sha256:51503a5050e14146bbba6bf8aec7dc09716a092eebfc08964ad77b5e37af6d44 +size 723404 diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java index b8abc6c2be8..f6b3f9e37f0 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java @@ -31,34 +31,35 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { @Test public void TestFunctionalEquivalent(){ String[] collCases = { + // note: in ICU 64, empty locales are shown as available for collation // avail locale equiv "f", "sv_US_CALIFORNIA", "sv", "f", "zh_TW@collation=stroke", "zh@collation=stroke", /* alias of zh_Hant_TW */ - "f", "zh_Hant_TW@collation=stroke", "zh@collation=stroke", + "t", "zh_Hant_TW@collation=stroke", "zh@collation=stroke", "f", "sv_CN@collation=pinyin", "sv", "t", "zh@collation=pinyin", "zh", "f", "zh_CN@collation=pinyin", "zh", /* alias of zh_Hans_CN */ - "f", "zh_Hans_CN@collation=pinyin", "zh", + "t", "zh_Hans_CN@collation=pinyin", "zh", "f", "zh_HK@collation=pinyin", "zh", /* alias of zh_Hant_HK */ - "f", "zh_Hant_HK@collation=pinyin", "zh", + "t", "zh_Hant_HK@collation=pinyin", "zh", "f", "zh_HK@collation=stroke", "zh@collation=stroke", /* alias of zh_Hant_HK */ - "f", "zh_Hant_HK@collation=stroke", "zh@collation=stroke", + "t", "zh_Hant_HK@collation=stroke", "zh@collation=stroke", "f", "zh_HK", "zh@collation=stroke", /* alias of zh_Hant_HK */ - "f", "zh_Hant_HK", "zh@collation=stroke", + "t", "zh_Hant_HK", "zh@collation=stroke", "f", "zh_MO", "zh@collation=stroke", /* alias of zh_Hant_MO */ - "f", "zh_Hant_MO", "zh@collation=stroke", + "t", "zh_Hant_MO", "zh@collation=stroke", "f", "zh_TW_STROKE", "zh@collation=stroke", "f", "zh_TW_STROKE@collation=big5han", "zh@collation=big5han", "f", "sv_CN@calendar=japanese", "sv", "t", "sv@calendar=japanese", "sv", "f", "zh_TW@collation=big5han", "zh@collation=big5han", /* alias of zh_Hant_TW */ - "f", "zh_Hant_TW@collation=big5han", "zh@collation=big5han", + "t", "zh_Hant_TW@collation=big5han", "zh@collation=big5han", "f", "zh_TW@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hant_TW */ - "f", "zh_Hant_TW@collation=gb2312han", "zh@collation=gb2312han", + "t", "zh_Hant_TW@collation=gb2312han", "zh@collation=gb2312han", "f", "zh_CN@collation=big5han", "zh@collation=big5han", /* alias of zh_Hans_CN */ - "f", "zh_Hans_CN@collation=big5han", "zh@collation=big5han", + "t", "zh_Hans_CN@collation=big5han", "zh@collation=big5han", "f", "zh_CN@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hans_CN */ - "f", "zh_Hans_CN@collation=gb2312han", "zh@collation=gb2312han", + "t", "zh_Hans_CN@collation=gb2312han", "zh@collation=gb2312han", "t", "zh@collation=big5han", "zh@collation=big5han", "t", "zh@collation=gb2312han", "zh@collation=gb2312han", "t", "hi@collation=standard", "hi",