ICU-12142 Update RBNF aliases for Cantonese and Spanish to match the current CLDR...

X-SVN-Rev: 38458

diff --git a/icu4c/source/data/icu-rbnf-deprecates.xml b/icu4c/source/data/icu-rbnf-deprecates.xml
index 7f77296a484572f673e8539fb0f2fd5e22503c6b..5c30f70b03d46a64710c80906f4a28365fd58824 100644 (file)
--- a/icu4c/source/data/icu-rbnf-deprecates.xml
+++ b/icu4c/source/data/icu-rbnf-deprecates.xml
@@ -1,26 +1,27 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2015, International Business Machines Corporation and         *
+* Copyright (C) 2015-2016, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
 -->
 <deprecates>
-   <alias from="es_DO" to="es_003" />
-   <alias from="es_GT" to="es_003" />
-   <alias from="es_HN" to="es_003" />
-   <alias from="es_MX" to="es_003" />
-   <alias from="es_NI" to="es_003" />
-   <alias from="es_PA" to="es_003" />
-   <alias from="es_PR" to="es_003" />
-   <alias from="es_SV" to="es_003" />
-   <alias from="es_US" to="es_003" />
+   <alias from="es_DO" to="es_419" />
+   <alias from="es_GT" to="es_419" />
+   <alias from="es_HN" to="es_419" />
+   <alias from="es_MX" to="es_419" />
+   <alias from="es_NI" to="es_419" />
+   <alias from="es_PA" to="es_419" />
+   <alias from="es_PR" to="es_419" />
+   <alias from="es_SV" to="es_419" />
+   <alias from="es_US" to="es_419" />
    <alias from="in" to="id" />
    <alias from="iw" to="he" />
    <alias from="no" to="nb" />
    <alias from="sh" to="sr_Latn" />
-   <alias from="zh_HK" to="zh_Hant_HK" />
-   <alias from="zh_MO" to="zh_Hant_HK" />
+   <alias from="zh_Hant_HK" to="yue" />
+   <alias from="zh_HK" to="yue" />
+   <alias from="zh_MO" to="yue" />
    <alias from="zh_TW" to="zh_Hant" />
 </deprecates>

diff --git a/icu4c/source/data/rbnf/es_003.txt b/icu4c/source/data/rbnf/es_003.txt
deleted file mode 100644 (file)
index 53a97b8..0000000
--- a/icu4c/source/data/rbnf/es_003.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2016 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * generated alias target
- */
-es_003{
-    ___{""}
-}

diff --git a/icu4c/source/data/rbnf/es_DO.txt b/icu4c/source/data/rbnf/es_DO.txt
index c66c66767a5794fc4530e1df9a3efc81c9ad9036..edd2cff59844cd6feef8db7afb56a9b47f133295 100644 (file)
--- a/icu4c/source/data/rbnf/es_DO.txt
+++ b/icu4c/source/data/rbnf/es_DO.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_DO{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_GT.txt b/icu4c/source/data/rbnf/es_GT.txt
index c45240e96cb0f6ce9ed871331f4e4c657d91b55e..938c5cabb99e0eb055fb18e4c451a7b141a70eb1 100644 (file)
--- a/icu4c/source/data/rbnf/es_GT.txt
+++ b/icu4c/source/data/rbnf/es_GT.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_GT{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_HN.txt b/icu4c/source/data/rbnf/es_HN.txt
index 1d7e6b17cad6b458fe21f9355bcf0a68b7031ff8..11b51e970d734695fdec20bc6b330ebf59c9c0bc 100644 (file)
--- a/icu4c/source/data/rbnf/es_HN.txt
+++ b/icu4c/source/data/rbnf/es_HN.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_HN{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_MX.txt b/icu4c/source/data/rbnf/es_MX.txt
index 76db225eb9e7879658ed920a36eaeb95bb79273d..ed8db14f5c94c48e85901078a99a0aa39cd41a34 100644 (file)
--- a/icu4c/source/data/rbnf/es_MX.txt
+++ b/icu4c/source/data/rbnf/es_MX.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_MX{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_NI.txt b/icu4c/source/data/rbnf/es_NI.txt
index 6a1cb8294a2b80734b338783436156c02ff9f12b..078b0791f67fee3be7da1a9737629155911a7172 100644 (file)
--- a/icu4c/source/data/rbnf/es_NI.txt
+++ b/icu4c/source/data/rbnf/es_NI.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_NI{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_PA.txt b/icu4c/source/data/rbnf/es_PA.txt
index 0c26e4477cee3220f500c3cc0190990e225d5c5b..e359c57547ae86268ebbcf08b366c2a16cf4fc05 100644 (file)
--- a/icu4c/source/data/rbnf/es_PA.txt
+++ b/icu4c/source/data/rbnf/es_PA.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_PA{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_PR.txt b/icu4c/source/data/rbnf/es_PR.txt
index 140890bbda29818b1dff82e31c57dba959ba2c19..c5c1582193d3a57b3c8d0c3855e084d0ffe71308 100644 (file)
--- a/icu4c/source/data/rbnf/es_PR.txt
+++ b/icu4c/source/data/rbnf/es_PR.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_PR{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_SV.txt b/icu4c/source/data/rbnf/es_SV.txt
index 4e6accfcc054d8015a53e26a7b2fdbc823a044e7..056e70dd1417c3b5df0857f3c0f1a3590bb2d44a 100644 (file)
--- a/icu4c/source/data/rbnf/es_SV.txt
+++ b/icu4c/source/data/rbnf/es_SV.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_SV{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/es_US.txt b/icu4c/source/data/rbnf/es_US.txt
index 7f8751861f99609a18cccdfb7d9c34766e770798..2550be2d9b31af31d56d90fc32154320a8a7eb28 100644 (file)
--- a/icu4c/source/data/rbnf/es_US.txt
+++ b/icu4c/source/data/rbnf/es_US.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 es_US{
-    "%%ALIAS"{"es_003"}
+    "%%ALIAS"{"es_419"}
 }

diff --git a/icu4c/source/data/rbnf/rbnffiles.mk b/icu4c/source/data/rbnf/rbnffiles.mk
index 3f21dd01bfe7b24f023fee9b9f8292c108399d3a..01ee2cbfd79b4b778a5336da98483d1bf4a0c60b 100644 (file)
--- a/icu4c/source/data/rbnf/rbnffiles.mk
+++ b/icu4c/source/data/rbnf/rbnffiles.mk
@@ -26,10 +26,10 @@ RBNF_CLDR_VERSION = %version%
 # Generated by LDML2ICUConverter, from LDML source files.
 
 # Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml)
-RBNF_SYNTHETIC_ALIAS = es_003.txt es_DO.txt es_GT.txt es_HN.txt\
- es_MX.txt es_NI.txt es_PA.txt es_PR.txt es_SV.txt\
- es_US.txt in.txt iw.txt no.txt sh.txt\
- zh_HK.txt zh_Hant_HK.txt zh_MO.txt zh_TW.txt
+RBNF_SYNTHETIC_ALIAS = es_DO.txt es_GT.txt es_HN.txt es_MX.txt\
+ es_NI.txt es_PA.txt es_PR.txt es_SV.txt es_US.txt\
+ in.txt iw.txt no.txt sh.txt zh_HK.txt\
+ zh_Hant_HK.txt zh_MO.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.

diff --git a/icu4c/source/data/rbnf/zh_HK.txt b/icu4c/source/data/rbnf/zh_HK.txt
index 30b7ea8879830bf4e1434242ee145db82fe2a52a..bb8c2d536d7096554c567f1a0fdc911633fe073c 100644 (file)
--- a/icu4c/source/data/rbnf/zh_HK.txt
+++ b/icu4c/source/data/rbnf/zh_HK.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 zh_HK{
-    "%%ALIAS"{"zh_Hant_HK"}
+    "%%ALIAS"{"yue"}
 }

diff --git a/icu4c/source/data/rbnf/zh_Hant_HK.txt b/icu4c/source/data/rbnf/zh_Hant_HK.txt
index 2aa19dac32318c8c4503a1619e64036babc838c9..8baa20a1928322c229ebd5754fcfdf87e128cf08 100755 (executable)
--- a/icu4c/source/data/rbnf/zh_Hant_HK.txt
+++ b/icu4c/source/data/rbnf/zh_Hant_HK.txt
@@ -6,9 +6,6 @@
 // * Source File: <path>/icu-locale-deprecates.xml & build.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_HK{
-    ___{""}
+    "%%ALIAS"{"yue"}
 }

diff --git a/icu4c/source/data/rbnf/zh_MO.txt b/icu4c/source/data/rbnf/zh_MO.txt
index 38284f15d40161b2ca7e2898412b42904152a070..c8a3e48529b0462342d1ba6764577cf65b3408e0 100644 (file)
--- a/icu4c/source/data/rbnf/zh_MO.txt
+++ b/icu4c/source/data/rbnf/zh_MO.txt
@@ -7,5 +7,5 @@
 // *
 // ***************************************************************************
 zh_MO{
-    "%%ALIAS"{"zh_Hant_HK"}
+    "%%ALIAS"{"yue"}
 }