From 4263537b9016f25fa90254504dafd3cd581962f7 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 2 Mar 2016 00:47:06 +0000
Subject: [PATCH] ICU-12142 Update RBNF aliases for Cantonese and Spanish to
 match the current CLDR locale inheritance

X-SVN-Rev: 38458
---
 icu4c/source/data/icu-rbnf-deprecates.xml | 25 ++++++++++++-----------
 icu4c/source/data/rbnf/es_003.txt         | 14 -------------
 icu4c/source/data/rbnf/es_DO.txt          |  2 +-
 icu4c/source/data/rbnf/es_GT.txt          |  2 +-
 icu4c/source/data/rbnf/es_HN.txt          |  2 +-
 icu4c/source/data/rbnf/es_MX.txt          |  2 +-
 icu4c/source/data/rbnf/es_NI.txt          |  2 +-
 icu4c/source/data/rbnf/es_PA.txt          |  2 +-
 icu4c/source/data/rbnf/es_PR.txt          |  2 +-
 icu4c/source/data/rbnf/es_SV.txt          |  2 +-
 icu4c/source/data/rbnf/es_US.txt          |  2 +-
 icu4c/source/data/rbnf/rbnffiles.mk       |  8 ++++----
 icu4c/source/data/rbnf/zh_HK.txt          |  2 +-
 icu4c/source/data/rbnf/zh_Hant_HK.txt     |  5 +----
 icu4c/source/data/rbnf/zh_MO.txt          |  2 +-
 15 files changed, 29 insertions(+), 45 deletions(-)
 delete mode 100644 icu4c/source/data/rbnf/es_003.txt

diff --git a/icu4c/source/data/icu-rbnf-deprecates.xml b/icu4c/source/data/icu-rbnf-deprecates.xml
index 7f77296a48..5c30f70b03 100644
--- 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
index 53a97b83d5..0000000000
--- 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 c66c66767a..edd2cff598 100644
--- 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 c45240e96c..938c5cabb9 100644
--- 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 1d7e6b17ca..11b51e970d 100644
--- 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 76db225eb9..ed8db14f5c 100644
--- 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 6a1cb8294a..078b0791f6 100644
--- 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 0c26e4477c..e359c57547 100644
--- 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 140890bbda..c5c1582193 100644
--- 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 4e6accfcc0..056e70dd14 100644
--- 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 7f8751861f..2550be2d9b 100644
--- 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 3f21dd01bf..01ee2cbfd7 100644
--- 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 30b7ea8879..bb8c2d536d 100644
--- 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 2aa19dac32..8baa20a192 100755
--- 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 38284f15d4..c8a3e48529 100644
--- 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"}
 }