ICU-8709 Merge CLDR ticket 4038 ( Spanish currency format)

X-SVN-Rev: 30356

diff --git a/icu4c/source/data/curr/es.txt b/icu4c/source/data/curr/es.txt
index 597ba835f195c11ff3863ae12b75b5fb41eb40fb..a51da6523273463057c479de097a260f4f43c693 100644 (file)
--- 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 16c54b3e958957786bb8f160f430cf58e5bda288..cee9bc047107ad29bbb6556a18774c312dbd5059 100644 (file)
--- 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 0d41c476cca251917c9020fae8e7d1ec704a55ad..3d0d542c450d5c9af68764a8a530fe74b5cef10d 100644 (file)
--- 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 f12ad55828dea7c488baa61804cc934868ad3aa9..897562160b0dad3d87d89d1be1813796af29467a 100644 (file)
--- 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 4f91eb60f5cfcf7e780d9ac06814b9ce9c31a0bf..45c1e4bd8a516b864adb64fa4dce1b3f961c8440 100644 (file)
--- 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 34b3c41dba3f4577a70aa3d5e0be09808a497859..561fe4d3c7fc5c5bea238103b18010462de3003d 100644 (file)
--- 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 4dd664ca6f8ad9a3005323eae8a95ee9f6a20268..2192231fcb7bb373255f27f17e773cb7fcf9b21b 100644 (file)
--- 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" },