From 02d8b5ab1c89bcef2627d2b621bfb35b573852c2 Mon Sep 17 00:00:00 2001 From: Rafal Luzynski Date: Thu, 6 Jun 2019 00:22:54 +0200 Subject: [PATCH] nl_NL locale: Correct the negative monetary format (bug 24614). According to CLDR 35.1 and the bug report the correct monetary format for negative amounts should be "EUR -1 234,56" while previously it was "EUR 1 234,56-". This patch does not change the thousands (grouping) separator. [BZ #24614] * localedata/Makefile (LOCALES): Add nl_NL.UTF-8. * localedata/locales/nl_NL (n_sep_by_space): Set to 2 (a space between the currency symbol and the minus sign). (n_sign_posn): Set to 4 (the minus sign after the currency symbol). * localedata/tst-strfmon1.c (tests): Add test data for nl_NL.UTF-8. --- ChangeLog | 9 +++++++++ localedata/Makefile | 1 + localedata/locales/nl_NL | 4 ++-- localedata/tst-strfmon1.c | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f5dac5190..7401f9f05a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2019-06-17 Rafal Luzynski + + [BZ #24614] + * localedata/Makefile (LOCALES): Add nl_NL.UTF-8. + * localedata/locales/nl_NL (n_sep_by_space): Set to 2 (a space + between the currency symbol and the minus sign). + (n_sign_posn): Set to 4 (the minus sign after the currency symbol). + * localedata/tst-strfmon1.c (tests): Add test data for nl_NL.UTF-8. + 2019-06-17 Adhemerval Zanella * sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines, diff --git a/localedata/Makefile b/localedata/Makefile index 65079f9eb8..586a58e1b2 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -245,6 +245,7 @@ LOCALES := \ nan_TW.UTF-8@latin \ nb_NO.ISO-8859-1 \ nb_NO.UTF-8 \ + nl_NL.UTF-8 \ nn_NO.ISO-8859-1 \ om_KE.UTF-8 \ os_RU.UTF-8 \ diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL index 1ab3277aa0..d0ba6c7283 100644 --- a/localedata/locales/nl_NL +++ b/localedata/locales/nl_NL @@ -83,9 +83,9 @@ frac_digits 2 p_cs_precedes 1 p_sep_by_space 1 n_cs_precedes 1 -n_sep_by_space 1 +n_sep_by_space 2 p_sign_posn 1 -n_sign_posn 2 +n_sign_posn 4 END LC_MONETARY LC_NUMERIC diff --git a/localedata/tst-strfmon1.c b/localedata/tst-strfmon1.c index 8292a6cad5..abad43114a 100644 --- a/localedata/tst-strfmon1.c +++ b/localedata/tst-strfmon1.c @@ -12,7 +12,8 @@ static const struct { "de_DE.ISO-8859-1", "|-12,34 EUR|-12,34|" }, { "da_DK.ISO-8859-1", "|kr. -12,34|-12,34|" }, { "zh_TW.EUC-TW", "|-NT$12.34|-12.34|" }, - { "sv_SE.ISO-8859-1", "|-12,34 kr|-12,34|" } + { "sv_SE.ISO-8859-1", "|-12,34 kr|-12,34|" }, + { "nl_NL.UTF-8", "|\u20ac -12,34|-12,34|" }, }; #define ntests (sizeof (tests) / sizeof (tests[0]))