"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",
# 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.
#
#
# -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.
#
# 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`
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
#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 <platform> is the runConfigureICU
+# there are no pre-existing errors. Here <platform> 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 <platform>
+./runConfigureICU <platform>
make all 2>&1 | tee /tmp/icu4c-oldData-makeAll.txt
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
# 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 <platform>
+# 7a. If any files were added or removed (likely), re-run configure:
+./runConfigureICU <platform>
+make clean
# 7b. Now do the rebuild.
make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.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 <platform>
# 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:
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_CM{
+ "%%ALIAS"{"ff_Latn_CM"}
+}
// © 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"}
}
/**
* generated alias target
*/
-ro_MD{
+ff_Latn_CM{
___{""}
}
/**
* generated alias target
*/
-ro_MD{
+ff_Latn_SN{
___{""}
}
// © 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"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_SN{
+ "%%ALIAS"{"ff_Latn_SN"}
+}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_CM{
+ "%%ALIAS"{"ff_Latn_CM"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_GN{
+ "%%ALIAS"{"ff_Latn_GN"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_CM{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_GN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_MR{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_SN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_MR{
+ "%%ALIAS"{"ff_Latn_MR"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_SN{
+ "%%ALIAS"{"ff_Latn_SN"}
+}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
// © 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"}
}
// © 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"}
}
// © 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"}
}
// © 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"}
}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_CM{
+ "%%ALIAS"{"ff_Latn_CM"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_GN{
+ "%%ALIAS"{"ff_Latn_GN"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_CM{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_GN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_MR{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_SN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_MR{
+ "%%ALIAS"{"ff_Latn_MR"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_SN{
+ "%%ALIAS"{"ff_Latn_SN"}
+}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_CM{
+ "%%ALIAS"{"ff_Latn_CM"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_GN{
+ "%%ALIAS"{"ff_Latn_GN"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_CM{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_GN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_MR{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_SN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_MR{
+ "%%ALIAS"{"ff_Latn_MR"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_SN{
+ "%%ALIAS"{"ff_Latn_SN"}
+}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_CM{
+ "%%ALIAS"{"ff_Latn_CM"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_GN{
+ "%%ALIAS"{"ff_Latn_GN"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_CM{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_GN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_MR{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+/**
+ * generated alias target
+ */
+ff_Latn_SN{
+ ___{""}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_MR{
+ "%%ALIAS"{"ff_Latn_MR"}
+}
--- /dev/null
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ff_SN{
+ "%%ALIAS"{"ff_Latn_SN"}
+}
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mo{
- "%%ALIAS"{"ro_MD"}
+ "%%ALIAS"{"ro"}
}
version https://git-lfs.github.com/spec/v1
-oid sha256:f5c4f0d2ae6d62092eead5171c68c492e26882724c1d36e1b8bae11b9751788e
-size 14112126
+oid sha256:b96976c9a34d2c58b73d955edb43d725e66c6c61ca1197cc22b3f1bcad220459
+size 12818509
version https://git-lfs.github.com/spec/v1
-oid sha256:640e2f8cc8e92949262848cbfa9fef63503e989717a4d4c36391fb8db79acb12
-size 94046
+oid sha256:b6e98819b735c51653941d402d794ffe62bb2f02fbaba03d29e3ea76ed7cd1ee
+size 94044
version https://git-lfs.github.com/spec/v1
-oid sha256:5b547e9bf978237e62bb995dbf5389615a9043844d8d24ce580531dea9ba00fd
-size 723410
+oid sha256:51503a5050e14146bbba6bf8aec7dc09716a092eebfc08964ad77b5e37af6d44
+size 723404
@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",
projects / icu / commitdiff