This is the mail archive of the
libc-alpha@sourceware.cygnus.com
mailing list for the glibc project.
Fixes for PR libc/1713 (currency formatting in german locale)
- To: libc-alpha Mailinglist <libc-alpha at sourceware dot cygnus dot com>
- Subject: Fixes for PR libc/1713 (currency formatting in german locale)
- From: Andreas Jaeger <aj at suse dot de>
- Date: 15 May 2000 13:56:48 +0200
- Cc: Christopher Creutzig <ccr at nescio dot foebud dot org>
I've commited the appended patches to fix some problems with the
german locale. As a german the patches look ok, but the old version
is also valid (but less popular). AFAIK neither Uli nor I found a
definitive guide how to represent the locales. If anybody has such a
document, please contact me and verify that the change is indeed
correct.
Besides making the change requested by Christopher, I also fixed the
testsuite and a failure which the test suite found.
Andreas
2000-05-15 Andreas Jaeger <aj@suse.de>
* tst-fmon.data: Change testcase following fixes for
de_DE.
* locales/de_DE: Remove space after DEM since DEM is
now placed after the value.
* locales/de_DE: Fix currency placement to use "12.345,68 DM".
Reported by Christopher Creutzig <ccr@nescio.foebud.org>, closes
PR libc/1713.
Index: localedata/tst-fmon.data
===================================================================
RCS file: /cvs/glibc/libc/localedata/tst-fmon.data,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tst-fmon.data 2000/04/10 05:10:25 1.5
+++ tst-fmon.data 2000/05/15 11:49:06 1.6
@@ -44,48 +44,48 @@
#
# check both the german locale and strfmon with that data
#
-de_DE.ISO-8859-1 %n 1.23 DM1,23
-de_DE.ISO-8859-1 %n -1.23 -DM1,23
-de_DE.ISO-8859-1 %n 1234.56 DM1.234,56
-de_DE.ISO-8859-1 %11n 123.45 DM123,45
-de_DE.ISO-8859-1 %11n -123.45 -DM123,45
-de_DE.ISO-8859-1 %11n 3456.781 DM3.456,78
-de_DE.ISO-8859-1 %^n 1234.56 DM1234,56
-de_DE.ISO-8859-1 %+n 1234.56 DM1.234,56
-de_DE.ISO-8859-1 %+n -1234.56 -DM1.234,56
-de_DE.ISO-8859-1 %(n 1234.56 DM1.234,56
-de_DE.ISO-8859-1 %(n -1234.56 (DM1.234,56)
-de_DE.ISO-8859-1 %^n 1234.56 DM1234,56
-de_DE.ISO-8859-1 %i 1.23 DEM 1,23
-de_DE.ISO-8859-1 %i -1.23 -DEM 1,23
-de_DE.ISO-8859-1 %i 1234.56 DEM 1.234,56
-de_DE.ISO-8859-1 %^i 1234.56 DEM 1234,56
-de_DE.ISO-8859-1 %+i 1234.56 DEM 1.234,56
-de_DE.ISO-8859-1 %+i -1234.56 -DEM 1.234,56
-de_DE.ISO-8859-1 %(i 1234.56 DEM 1.234,56
-de_DE.ISO-8859-1 %(i -1234.56 (DEM 1.234,56)
-de_DE.ISO-8859-1 %^i 1234.56 DEM 1234,56
-de_DE.ISO-8859-1 %#5n 123.45 DM 123,45
-de_DE.ISO-8859-1 %#5n -123.45 -DM 123,45
-de_DE.ISO-8859-1 %#5n 3456.781 DM 3.456,78
-de_DE.ISO-8859-1 %=*#5n 123.45 DM***123,45
-de_DE.ISO-8859-1 %=*#5n -123.45 -DM***123,45
-de_DE.ISO-8859-1 %=*#5n 3456.781 DM*3.456,78
-de_DE.ISO-8859-1 %=0#5n 123.45 DM000123,45
-de_DE.ISO-8859-1 %=0#5n -123.45 -DM000123,45
-de_DE.ISO-8859-1 %=0#5n 3456.781 DM03.456,78
-de_DE.ISO-8859-1 %^#5n 123.45 DM 123,45
-de_DE.ISO-8859-1 %^#5n -123.45 -DM 123,45
-de_DE.ISO-8859-1 %^#5n 3456.781 DM 3456,78
-de_DE.ISO-8859-1 %^#5.0n 123.45 DM 123
-de_DE.ISO-8859-1 %^#5.0n -123.45 -DM 123
-de_DE.ISO-8859-1 %^#5.0n 3456.781 DM 3457
-de_DE.ISO-8859-1 %^#5.4n 123.45 DM 123,4500
-de_DE.ISO-8859-1 %^#5.4n -123.45 -DM 123,4500
-de_DE.ISO-8859-1 %^#5.4n 3456.781 DM 3456,7810
-de_DE.ISO-8859-1 %(#5n 123.45 DM 123,45
-de_DE.ISO-8859-1 %(#5n -123.45 (DM 123,45)
-de_DE.ISO-8859-1 %(#5n 3456.781 DM 3.456,78
+de_DE.ISO-8859-1 %n 1.23 1,23 DM
+de_DE.ISO-8859-1 %n -1.23 -1,23 DM
+de_DE.ISO-8859-1 %n 1234.56 1.234,56 DM
+de_DE.ISO-8859-1 %11n 123.45 123,45 DM
+de_DE.ISO-8859-1 %11n -123.45 -123,45 DM
+de_DE.ISO-8859-1 %11n 3456.781 3.456,78 DM
+de_DE.ISO-8859-1 %^n 1234.56 1234,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 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 %#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
+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
+de_DE.ISO-8859-1 %=0#5n 123.45 000123,45 DM
+de_DE.ISO-8859-1 %=0#5n -123.45 -000123,45 DM
+de_DE.ISO-8859-1 %=0#5n 3456.781 03.456,78 DM
+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 3456,78 DM
+de_DE.ISO-8859-1 %^#5.0n 123.45 123 DM
+de_DE.ISO-8859-1 %^#5.0n -123.45 - 123 DM
+de_DE.ISO-8859-1 %^#5.0n 3456.781 3457 DM
+de_DE.ISO-8859-1 %^#5.4n 123.45 123,4500 DM
+de_DE.ISO-8859-1 %^#5.4n -123.45 - 123,4500 DM
+de_DE.ISO-8859-1 %^#5.4n 3456.781 3456,7810 DM
+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
de_DE.ISO-8859-1 %!(#5n 123.45 123,45
de_DE.ISO-8859-1 %!(#5n -123.45 ( 123,45)
de_DE.ISO-8859-1 %!(#5n 3456.781 3.456,78
Index: localedata/locales/de_DE
===================================================================
RCS file: /cvs/glibc/libc/localedata/locales/de_DE,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- de_DE 1999/12/11 02:47:58 1.7
+++ de_DE 2000/05/15 11:49:07 1.9
@@ -2143,7 +2143,7 @@
END LC_MESSAGES
LC_MONETARY
-int_curr_symbol "<D><E><M><SP>"
+int_curr_symbol "<D><E><M>"
currency_symbol "<D><M>"
mon_decimal_point "<,>"
mon_thousands_sep "<.>"
@@ -2152,10 +2152,10 @@
negative_sign "<->"
int_frac_digits 2
frac_digits 2
-p_cs_precedes 1
-p_sep_by_space 0
-n_cs_precedes 1
-n_sep_by_space 0
+p_cs_precedes 0
+p_sep_by_space 1
+n_cs_precedes 0
+n_sep_by_space 1
p_sign_posn 1
n_sign_posn 1
END LC_MONETARY
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de