diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/tests-mbwc/dat_strfmon.c | 54 | ||||
| -rw-r--r-- | localedata/tst-fmon.data | 18 |
2 files changed, 9 insertions, 63 deletions
diff --git a/localedata/tests-mbwc/dat_strfmon.c b/localedata/tests-mbwc/dat_strfmon.c index ada8c47b0a..1252ecfe4e 100644 --- a/localedata/tests-mbwc/dat_strfmon.c +++ b/localedata/tests-mbwc/dat_strfmon.c @@ -20,23 +20,13 @@ TST_STRFMON tst_strfmon_loc [] = { { { /* #01 */ -#ifdef NO_WAIVER /*inp*/ { 23, "%n %% %i", 123.00 }, /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, -#else - /*inp*/ { 24, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " }, -#endif }, { /* #02 */ -#ifdef NO_WAIVER /*inp*/ { 23, "%n %% %i", 123.00 }, /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, -#else - /*inp*/ { 24, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " }, -#endif }, { /* #03 */ @@ -46,101 +36,57 @@ TST_STRFMON tst_strfmon_loc [] = { { /* #04 */ /*inp*/ { 30, "%n|%i", 1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,24, "1.234,56 DM|1.234,56 DEM" }, -#else - /*exp*/ { 1,0,1,25, "1.234,56 DM|1.234,56 DEM " }, -#endif }, { /* #05 */ /*inp*/ { 32, "%n|%i", -1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "}, -#endif }, { /* #06 */ /*inp*/ { 32, "%12n|%12i", 1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,25, " 1.234,56 DM|1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,26, " 1.234,56 DM|1.234,56 DEM "}, -#endif }, { /* #07 */ /*inp*/ { 32, "%12n|%12i", -1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "}, -#endif }, { /* #08 */ /*inp*/ { 32, "%#5n|%#5i", 1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, " 1.234,56 DM| 1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,29, " 1.234,56 DM| 1.234,56 DEM "}, -#endif }, { /* #09 */ /*inp*/ { 32, "%#5n|%#5i", -1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, "- 1.234,56 DM|- 1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,29, "- 1.234,56 DM|- 1.234,56 DEM "}, -#endif }, { /* #10 */ /*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, " *1.234,56 DM| *1.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,29, " *1.234,56 DM| *1.234,56 DEM "}, -#endif }, { /* #11 */ /*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, "-01.234,56 DM|-01.234,56 DEM"}, -#else - /*exp*/ { 1,0,1,29, "-01.234,56 DM|-01.234,56 DEM "}, -#endif }, { /* #12 */ /*inp*/ { 32, "%^#5n|%^#5i", -1234.561 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "- 1234,56 DM|- 1234,56 DEM"}, -#else - /*exp*/ { 1,0,1,27, "- 1234,56 DM|- 1234,56 DEM "}, -#endif }, { /* #13 */ /*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,22, " 1.234 DM| 1.234 DEM" }, -#else - /*exp*/ { 1,0,1,23, " 1.234 DM| 1.234 DEM " }, -#endif }, { /* #14 */ /*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 }, -#ifdef NO_WAIVER /*exp*/ { 1,0,1,27, "- 1.235 DM|- 1.234,5550 DEM"}, -#else - /*exp*/ { 1,0,1,28, "- 1.235 DM|- 1.234,5550 DEM "}, -#endif }, { /* #15 */ diff --git a/localedata/tst-fmon.data b/localedata/tst-fmon.data index c5b5813d18..db0e3f7abf 100644 --- a/localedata/tst-fmon.data +++ b/localedata/tst-fmon.data @@ -56,15 +56,15 @@ de_DE.ISO-8859-1 %+n -1234.56 -1.234,56 DM de_DE.ISO-8859-1 %(n 1234.56 1.234,56 DM de_DE.ISO-8859-1 %(n -1234.56 (1.234,56 DM) de_DE.ISO-8859-1 %^n 1234.56 1234,56 DM -de_DE.ISO-8859-1 %i 1.23 1,23 DEM -de_DE.ISO-8859-1 %i -1.23 -1,23 DEM -de_DE.ISO-8859-1 %i 1234.56 1.234,56 DEM -de_DE.ISO-8859-1 %^i 1234.56 1234,56 DEM -de_DE.ISO-8859-1 %+i 1234.56 1.234,56 DEM -de_DE.ISO-8859-1 %+i -1234.56 -1.234,56 DEM -de_DE.ISO-8859-1 %(i 1234.56 1.234,56 DEM -de_DE.ISO-8859-1 %(i -1234.56 (1.234,56 DEM ) -de_DE.ISO-8859-1 %^i 1234.56 1234,56 DEM +de_DE.ISO-8859-1 %i 1.23 1,23 DEM +de_DE.ISO-8859-1 %i -1.23 -1,23 DEM +de_DE.ISO-8859-1 %i 1234.56 1.234,56 DEM +de_DE.ISO-8859-1 %^i 1234.56 1234,56 DEM +de_DE.ISO-8859-1 %+i 1234.56 1.234,56 DEM +de_DE.ISO-8859-1 %+i -1234.56 -1.234,56 DEM +de_DE.ISO-8859-1 %(i 1234.56 1.234,56 DEM +de_DE.ISO-8859-1 %(i -1234.56 (1.234,56 DEM) +de_DE.ISO-8859-1 %^i 1234.56 1234,56 DEM de_DE.ISO-8859-1 %#5n 123.45 123,45 DM de_DE.ISO-8859-1 %#5n -123.45 - 123,45 DM de_DE.ISO-8859-1 %#5n 3456.781 3.456,78 DM |