about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/tests-mbwc/dat_strfmon.c58
2 files changed, 32 insertions, 29 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f023454f67..c8e043f4e0 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* tests-mbwc/dat_strfmon.c (tst_strfmon_loc): Adjust test data for
+	Euro locales.
+
 	* locales/br_FR: Eliminate old national currencies of countries
 	participating in Euro.  Make @euro files pure copies.
 	* locales/ca_ES: Likewise.
diff --git a/localedata/tests-mbwc/dat_strfmon.c b/localedata/tests-mbwc/dat_strfmon.c
index 1e2035375a..d06169814f 100644
--- a/localedata/tests-mbwc/dat_strfmon.c
+++ b/localedata/tests-mbwc/dat_strfmon.c
@@ -20,78 +20,78 @@ TST_STRFMON tst_strfmon_loc [] = {
     {
       {
 	/* #01 */
-	/*inp*/ { 23, "%n %% %i",	     123.00			},
-	/*exp*/ { 0,1,22,		     "123,00 DM % 123,00 DEM"	},
+	/*inp*/ { 24, "%n %% %i",	     123.00			},
+	/*exp*/ { 0,1,23,		     "123,00 EUR % 123,00 EUR"	},
       },
       {
 	/* #02 */
-	/*inp*/ { 23, "%n %% %i",	     123.00			},
-	/*exp*/ { 0,1,22,		     "123,00 DM % 123,00 DEM"	},
+	/*inp*/ { 24, "%n %% %i",	     123.00			},
+	/*exp*/ { 0,1,23,		     "123,00 EUR % 123,00 EUR"	},
       },
       {
 	/* #03 */
-	/*inp*/ { 22, "%n %% %i",	     123.00			},
+	/*inp*/ { 23, "%n %% %i",	     123.00			},
 	/*exp*/ { E2BIG,1,-1,	     ""					},
       },
       {
 	/* #04 */
-	/*inp*/ { 30, "%n|%i",	     1234.561				},
-	/*exp*/ { 0,1,24,		     "1.234,56 DM|1.234,56 DEM"	},
+	/*inp*/ { 31, "%n|%i",	     1234.561				},
+	/*exp*/ { 0,1,25,		     "1.234,56 EUR|1.234,56 EUR"},
       },
       {
 	/* #05 */
-	/*inp*/ { 32, "%n|%i",	    -1234.561				},
-	/*exp*/ { 0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
+	/*inp*/ { 33, "%n|%i",	    -1234.561				},
+	/*exp*/ { 0,1,27,		     "-1.234,56 EUR|-1.234,56 EUR"},
       },
       {
 	/* #06 */
-	/*inp*/ { 32, "%12n|%12i",	     1234.561			},
-	/*exp*/ { 0,1,25,		     " 1.234,56 DM|1.234,56 DEM"},
+	/*inp*/ { 33, "%13n|%12i",	     1234.561			},
+	/*exp*/ { 0,1,26,		     " 1.234,56 EUR|1.234,56 EUR"},
       },
       {
 	/* #07 */
-	/*inp*/ { 32, "%12n|%12i",	    -1234.561			},
-	/*exp*/ { 0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
+	/*inp*/ { 33, "%12n|%12i",	    -1234.561			},
+	/*exp*/ { 0,1,27,		     "-1.234,56 EUR|-1.234,56 EUR"},
       },
       {
 	/* #08 */
-	/*inp*/ { 32, "%#5n|%#5i",	     1234.561			},
-	/*exp*/ { 0,1,28,		     "  1.234,56 DM|  1.234,56 DEM"},
+	/*inp*/ { 33, "%#5n|%#5i",	     1234.561			},
+	/*exp*/ { 0,1,29,		     "  1.234,56 EUR|  1.234,56 EUR"},
       },
       {
 	/* #09 */
-	/*inp*/ { 32, "%#5n|%#5i",	    -1234.561			},
-	/*exp*/ { 0,1,28,		     "- 1.234,56 DM|- 1.234,56 DEM"},
+	/*inp*/ { 33, "%#5n|%#5i",	    -1234.561			},
+	/*exp*/ { 0,1,29,		     "- 1.234,56 EUR|- 1.234,56 EUR"},
       },
       {
 	/* #10 */
-	/*inp*/ { 32, "%=*#5n|%=*#5i",	 1234.561			},
-	/*exp*/ { 0,1,28,		     " *1.234,56 DM| *1.234,56 DEM"},
+	/*inp*/ { 33, "%=*#5n|%=*#5i",	 1234.561			},
+	/*exp*/ { 0,1,29,		     " *1.234,56 EUR| *1.234,56 EUR"},
       },
       {
 	/* #11 */
-	/*inp*/ { 32, "%=0#5n|%=0#5i",	-1234.561			},
-	/*exp*/ { 0,1,28,		     "-01.234,56 DM|-01.234,56 DEM"},
+	/*inp*/ { 33, "%=0#5n|%=0#5i",	-1234.561			},
+	/*exp*/ { 0,1,29,		     "-01.234,56 EUR|-01.234,56 EUR"},
       },
       {
 	/* #12 */
-	/*inp*/ { 32, "%^#5n|%^#5i",	-1234.561			},
-	/*exp*/ { 0,1,26,		     "- 1234,56 DM|- 1234,56 DEM"},
+	/*inp*/ { 33, "%^#5n|%^#5i",	-1234.561			},
+	/*exp*/ { 0,1,27,		     "- 1234,56 EUR|- 1234,56 EUR"},
       },
       {
 	/* #13 */
-	/*inp*/ { 32, "%#5.0n|%#5.0i",	 1234.444			},
-	/*exp*/ { 0,1,22,		     "  1.234 DM|  1.234 DEM"	},
+	/*inp*/ { 33, "%#5.0n|%#5.0i",	 1234.444			},
+	/*exp*/ { 0,1,23,		     "  1.234 EUR|  1.234 EUR"	},
       },
       {
 	/* #14 */
-	/*inp*/ { 32, "%#5.0n|%#5.4i",	-1234.555			},
-	/*exp*/ { 0,1,27,		     "- 1.235 DM|- 1.234,5550 DEM"},
+	/*inp*/ { 33, "%#5.0n|%#5.4i",	-1234.555			},
+	/*exp*/ { 0,1,28,		     "- 1.235 EUR|- 1.234,5550 EUR"},
       },
       {
 	/* #15 */
-	/*inp*/ { 32, "%(#5n|%!(#5i",	-1234.561			},
-	/*exp*/ { 0,1,26,		     "( 1.234,56 DM)|( 1.234,56)"},
+	/*inp*/ { 33, "%(#5n|%!(#5i",	-1234.561			},
+	/*exp*/ { 0,1,27,		     "( 1.234,56 EUR)|( 1.234,56)"},
       },
       { is_last: 1 }
     }