aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--localedata/locales/el_CY16
-rw-r--r--localedata/locales/el_GR2
-rw-r--r--stdlib/tst-strfmon_l.c4
4 files changed, 11 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index bcd43a9..0a51afd 100644
--- 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 7bb5a3e..492cd90 100644
--- 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 bdeb840..920a4a7 100644
--- 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 dff186f..1d8c842 100644
--- 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",
}
}
},