ICU-7103 remove obsolete/redundant collation locales

X-SVN-Rev: 33274

diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml
index fd39bb7b401ef745722c4ef7b160cafad528c8fd..252e23484252d91e889e13ea56bfb479bd9db386 100644 (file)
--- a/icu4c/source/data/build.xml
+++ b/icu4c/source/data/build.xml
@@ -246,9 +246,6 @@
                  <deprecates>
                     <alias from="de__PHONEBOOK" to="de@collation=phonebook"  xpath="//ldml/collations/default[@type='phonebook']"/>
                     <alias from="es__TRADITIONAL" to="es@collation=traditional" xpath="//ldml/collations/default[@type='traditional']"/>
-                    <alias from="hi__DIRECT" to="hi@collation=direct" xpath="//ldml/collations/default[@type='direct']"/>
-                    <alias from="zh__PINYIN" to="zh@collation=pinyin" xpath="//ldml/collations/default[@type='pinyin']"/>
-                    <alias from="zh_TW_STROKE" to="zh@collation=stroke" xpath="//ldml/collations/default[@type='stroke']"/>
                     <alias from="in" to="id" />
                     <alias from="in_ID" to="id_ID" />
                     <alias from="iw" to="he" />
@@ -271,8 +268,6 @@
                     <alias from="zh_TW" to="zh_Hant_TW" />
                     <emptyLocale locale="de_" />
                     <emptyLocale locale="es_" />
-                    <emptyLocale locale="hi_" />
-                    <emptyLocale locale="zh_" />
                 </deprecates>
             </run>
         </cldr-build>

diff --git a/icu4c/source/data/coll/colfiles.mk b/icu4c/source/data/coll/colfiles.mk
index f4c6c936d0f098fcf26c89869aecf5bbaff6ae8f..734fe7eed174bc8e4dea4727aab3113a89e6e053 100644 (file)
--- a/icu4c/source/data/coll/colfiles.mk
+++ b/icu4c/source/data/coll/colfiles.mk
@@ -27,11 +27,11 @@ COLLATION_CLDR_VERSION = 23
 
 # Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml)
 COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt es__TRADITIONAL.txt\
- hi_.txt hi__DIRECT.txt in.txt in_ID.txt iw.txt\
+ in.txt in_ID.txt iw.txt\
  iw_IL.txt mo.txt no.txt no_NO.txt pa_IN.txt\
  sh.txt sh_BA.txt sh_YU.txt sr_BA.txt sr_ME.txt\
- sr_RS.txt zh_.txt zh_CN.txt zh_HK.txt zh_MO.txt\
- zh_SG.txt zh_TW.txt zh_TW_STROKE.txt zh__PINYIN.txt
+ sr_RS.txt zh_CN.txt zh_HK.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.

diff --git a/icu4c/source/data/coll/hi_.txt b/icu4c/source/data/coll/hi_.txt
deleted file mode 100644 (file)
index eace60d..0000000
--- a/icu4c/source/data/coll/hi_.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2013 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * empty locale file for dependency checking
- */
-hi_{
-    /**
-     * so genrb doesn't issue warnings
-     */
-    ___{""}
-}

diff --git a/icu4c/source/data/coll/hi__DIRECT.txt b/icu4c/source/data/coll/hi__DIRECT.txt
deleted file mode 100644 (file)
index 406d813..0000000
--- a/icu4c/source/data/coll/hi__DIRECT.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2013 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-hi__DIRECT{
-    collations{
-        default{"direct"}
-    }
-}

diff --git a/icu4c/source/data/coll/zh_.txt b/icu4c/source/data/coll/zh_.txt
deleted file mode 100644 (file)
index f67abac..0000000
--- a/icu4c/source/data/coll/zh_.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2013 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * empty locale file for dependency checking
- */
-zh_{
-    /**
-     * so genrb doesn't issue warnings
-     */
-    ___{""}
-}

diff --git a/icu4c/source/data/coll/zh_TW_STROKE.txt b/icu4c/source/data/coll/zh_TW_STROKE.txt
deleted file mode 100644 (file)
index 5d3bee9..0000000
--- a/icu4c/source/data/coll/zh_TW_STROKE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2013 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-zh_TW_STROKE{
-    collations{
-        default{"stroke"}
-    }
-}

diff --git a/icu4c/source/data/coll/zh__PINYIN.txt b/icu4c/source/data/coll/zh__PINYIN.txt
deleted file mode 100644 (file)
index 58cdffa..0000000
--- a/icu4c/source/data/coll/zh__PINYIN.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2013 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-zh__PINYIN{
-    collations{
-        default{"pinyin"}
-    }
-}