ICU-12185 Fix LDML2ICUConversion of cashDigits/cashRounding

X-SVN-Rev: 38389

diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt
index 1b0533dac08d11d756eacfb7c89ca6af9de497e2..0c79c7b01e576d25171568804f3582244d400f61 100644 (file)
--- a/icu4c/source/data/curr/supplementalData.txt
+++ b/icu4c/source/data/curr/supplementalData.txt
@@ -4759,13 +4759,13 @@ supplementalData:table(nofallback){
             2,
             0,
             2,
-            0,
+            5,
         }
         CHF:intvector{
             2,
             0,
             2,
-            0,
+            5,
         }
         CLF:intvector{
             4,
@@ -4794,7 +4794,7 @@ supplementalData:table(nofallback){
         CZK:intvector{
             2,
             0,
-            2,
+            0,
             0,
         }
         DEFAULT:intvector{
@@ -4830,7 +4830,7 @@ supplementalData:table(nofallback){
         HUF:intvector{
             2,
             0,
-            2,
+            0,
             0,
         }
         IDR:intvector{
@@ -5034,7 +5034,7 @@ supplementalData:table(nofallback){
         TWD:intvector{
             2,
             0,
-            2,
+            0,
             0,
         }
         TZS:intvector{

diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c
index 411fcd6a76b22c4c1fd1e0053c2a78d21a644b29..c4f4cdcfbdb6fe8ccfa4d2df8a7e5d737fb8b19f 100644 (file)
--- a/icu4c/source/test/cintltst/cnumtst.c
+++ b/icu4c/source/test/cintltst/cnumtst.c
@@ -2555,11 +2555,11 @@ static void TestCurrencyUsage(void) {
          * format result using CURRENCYSTYLE with CASH purpose,-
          * Note that as of CLDR 26:-
          * - TWD switches from 0 decimals to 2; PKR still has 0, so change test to that
-         * - CAD and all other currencies that rounded to .05 no longer do
+         * - CAD rounds to .05
          */
 
         {"PKR", "PKR124"},
-        {"CAD", "CA$123.57"},
+        {"CAD", "CA$123.55"},
         {"USD", "$123.57"}
     };