Place monetary symbol in el_GR and el_CY after the amount

CLDR uses this pattern as well.

	[BZ #22019]
	* localedata/locales/el_GR: Set n_cs_precedes to 0.
	* localedata/locales/el_CY: copy "el_GR" because it is identical.
	* stdlib/tst-strfmon_l.c: adapt test case.

diff --git a/ChangeLog b/ChangeLog
index bcd43a9438690105cd8e9b55c6f7b1ad5148c66d..0a51afd936ae5fb3e7dfd057832d7523982bf125 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-17  Mike FABIAN  <mfabian@redhat.com>
+
+       [BZ #22019]
+       * localedata/locales/el_GR: Set n_cs_precedes to 0.
+       * localedata/locales/el_CY: copy "el_GR" because it is identical.
+       * stdlib/tst-strfmon_l.c: adapt test case.
+
 2017-10-16  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/generic/float128-abi.h: New file.

diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
index 7bb5a3eaf806e7d2d9286ca42cb2c162ee23a4af..492cd90bf2f37fdf61d116e8abcaeb2c83e5a874 100644 (file)
--- a/localedata/locales/el_CY
+++ b/localedata/locales/el_CY
@@ -51,21 +51,7 @@ copy "el_GR"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol       "<U0045><U0055><U0052><U0020>"
-currency_symbol       "<U20AC>"
-mon_decimal_point     "<U002C>"
-mon_thousands_sep     "<U002E>"
-mon_grouping          3
-positive_sign         ""
-negative_sign         "<U002D>"
-int_frac_digits       2
-frac_digits           2
-p_cs_precedes         0
-p_sep_by_space        0
-n_cs_precedes         1
-n_sep_by_space        0
-p_sign_posn           1
-n_sign_posn           1
+copy "el_GR"
 END LC_MONETARY
 
 LC_NUMERIC

diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index bdeb84009f63b2a79c7e7156c9c7ba5850d6b0e4..920a4a7da64d4110a87b30318dd3ee721a179ebb 100644 (file)
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -80,7 +80,7 @@ int_frac_digits       2
 frac_digits           2
 p_cs_precedes         0
 p_sep_by_space        0
-n_cs_precedes         1
+n_cs_precedes         0
 n_sep_by_space        0
 p_sign_posn           1
 n_sign_posn           1

diff --git a/stdlib/tst-strfmon_l.c b/stdlib/tst-strfmon_l.c
index dff186f97ada6a09289fe8b37070211c313f813b..1d8c8429255492a99533cf11c32442c1f46f0de5 100644 (file)
--- a/stdlib/tst-strfmon_l.c
+++ b/stdlib/tst-strfmon_l.c
@@ -193,8 +193,8 @@ static const struct locale_pair tests[] =
           "1234567,89EUR", "1234567,89\u20ac"
         },
         {
-          "-EUR1.234.567,89", "-\u20ac1.234.567,89",
-          "-EUR1234567,89", "-\u20ac1234567,89",
+          "-1.234.567,89EUR", "-1.234.567,89\u20ac",
+          "-1234567,89EUR", "-1234567,89\u20ac",
         }
       }
     },