From ec44df4e861e47647c3722f439c6765fc53c83ae Mon Sep 17 00:00:00 2001
From: John Emmons <emmo@us.ibm.com>
Date: Thu, 14 Jul 2011 22:31:24 +0000
Subject: [PATCH] ICU-8709 Merge CLDR ticket 4038 ( Spanish currency format)

X-SVN-Rev: 30356
---
 icu4c/source/data/curr/es.txt           | 2 +-
 icu4c/source/data/lang/es.txt           | 2 +-
 icu4c/source/data/locales/es.txt        | 4 ++--
 icu4c/source/data/region/es.txt         | 2 +-
 icu4c/source/data/zone/es.txt           | 2 +-
 icu4c/source/test/cintltst/cnmdptst.c   | 2 +-
 icu4c/source/test/intltest/numfmtst.cpp | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/icu4c/source/data/curr/es.txt b/icu4c/source/data/curr/es.txt
index 597ba835f19..a51da652327 100644
--- a/icu4c/source/data/curr/es.txt
+++ b/icu4c/source/data/curr/es.txt
@@ -2073,5 +2073,5 @@ es{
     CurrencyUnitPatterns{
         other{"{0} {1}"}
     }
-    Version{"2.0.59.53"}
+    Version{"2.0.60.15"}
 }
diff --git a/icu4c/source/data/lang/es.txt b/icu4c/source/data/lang/es.txt
index 16c54b3e958..cee9bc04710 100644
--- a/icu4c/source/data/lang/es.txt
+++ b/icu4c/source/data/lang/es.txt
@@ -729,7 +729,7 @@ es{
         VALENCIA{"Valenciano"}
         WADEGILE{"Romanización Wade-Giles"}
     }
-    Version{"2.0.59.53"}
+    Version{"2.0.60.15"}
     codePatterns{
         language{"Idioma: {0}"}
         script{"Dialecto: {0}"}
diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt
index 0d41c476cca..3d0d542c450 100644
--- a/icu4c/source/data/locales/es.txt
+++ b/icu4c/source/data/locales/es.txt
@@ -24,7 +24,7 @@ es{
     NumberElements{
         latn{
             patterns{
-                currencyFormat{"¤ #,##0.00"}
+                currencyFormat{"#,##0.00 ¤"}
                 decimalFormat{"#,##0.###"}
                 percentFormat{"#,##0%"}
                 scientificFormat{"#E0"}
@@ -43,7 +43,7 @@ es{
             }
         }
     }
-    Version{"2.0.59.53"}
+    Version{"2.0.60.15"}
     calendar{
         buddhist{
             DateTimePatterns{
diff --git a/icu4c/source/data/region/es.txt b/icu4c/source/data/region/es.txt
index f12ad55828d..897562160b0 100644
--- a/icu4c/source/data/region/es.txt
+++ b/icu4c/source/data/region/es.txt
@@ -303,5 +303,5 @@ es{
         ZW{"Zimbabue"}
         ZZ{"Región desconocida"}
     }
-    Version{"2.0.59.53"}
+    Version{"2.0.60.15"}
 }
diff --git a/icu4c/source/data/zone/es.txt b/icu4c/source/data/zone/es.txt
index 4f91eb60f5c..45c1e4bd8a5 100644
--- a/icu4c/source/data/zone/es.txt
+++ b/icu4c/source/data/zone/es.txt
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/es.xml
  */
 es{
-    Version{"2.0.59.53"}
+    Version{"2.0.60.15"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abiyán"}
diff --git a/icu4c/source/test/cintltst/cnmdptst.c b/icu4c/source/test/cintltst/cnmdptst.c
index 34b3c41dba3..561fe4d3c7f 100644
--- a/icu4c/source/test/cintltst/cnmdptst.c
+++ b/icu4c/source/test/cintltst/cnmdptst.c
@@ -471,7 +471,7 @@ static void TestCurrencyPreEuro(void)
 
     const char* result[]={
         "2\\u00A0\\u20A7", "2\\u00A0F",            "IEP1.50",                      "1,50\\u00A0FIM",   "2\\u00A0F",         "ITL\\u00A02",
-        "1$50\\u00A0Esc.", "\\u00F6S\\u00A01,50",  "1,50\\u00A0\\u0394\\u03C1\\u03C7", "\\u20A7\\u00A02", "1,50\\u00A0FB",     "IEP1.50",
+        "1$50\\u00A0Esc.", "\\u00F6S\\u00A01,50",  "1,50\\u00A0\\u0394\\u03C1\\u03C7", "2\\u00A0\\u20A7", "1,50\\u00A0FB",     "IEP1.50",
         "1,50\\u00A0BEF",   "1,50\\u00A0DEM",        "1,50\\u00A0BEF",                    "2\\u00A0\\u20A7", "1,50\\u00A0F",      "2\\u00A0\\u20A7",
         "NLG\\u00A01,50"
     };
diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index 4dd664ca6f8..2192231fcb7 100644
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -693,7 +693,7 @@ static const char* testCases[][2]= {
     {"de_LU_PREEURO", "1,150\\u00A0F" },
     {"el_GR_PREEURO", "1.150,50\\u00A0\\u0394\\u03C1\\u03C7" },
     {"en_BE_PREEURO", "1.150,50\\u00A0BEF" },
-    {"es_ES_PREEURO", "\\u20A7\\u00A01.150" },
+    {"es_ES_PREEURO", "1.150\\u00A0\\u20A7" },
     {"eu_ES_PREEURO", "1.150\\u00A0\\u20A7" },
     {"gl_ES_PREEURO", "1.150\\u00A0\\u20A7" },
     {"it_IT_PREEURO", "ITL\\u00A01.150" },
-- 
2.40.0