about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/locales/el_GR29
2 files changed, 26 insertions, 7 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2d8013a887..ac7ed57808 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-24  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #588]
+	* locales/el_GR: Change to use 12h time format.
+	Patch by Konstantinos Margaritis <markos@debian.org>.
+
 	* SUPPORTED (SUPPORTED-LOCALES): Add hsb_DE and hsb_DE.UTF-8.
 
 	[BZ #566]
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index 95278657a3..d729d43298 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -112,14 +112,29 @@ mon     "<U0399><U03B1><U03BD><U03BF><U03C5><U03AC><U03C1><U03B9><U03BF><U03C2>"
         "<U039F><U03BA><U03C4><U03CE><U03B2><U03C1><U03B9><U03BF><U03C2>";/
         "<U039D><U03BF><U03AD><U03BC><U03B2><U03C1><U03B9><U03BF><U03C2>";/
         "<U0394><U03B5><U03BA><U03AD><U03BC><U03B2><U03C1><U03B9><U03BF><U03C2>"
-d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+% Greece uses 12h time: http://publications.eu.int/code/el/el-4100800el.htm
+% Appropriate date and time representation (%c)
+%       "%a %d %b %Y %r %Z"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
+%
+% Appropriate date representation (%x)
+%       "%d/%m/%Y"
 d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
-t_fmt   "<U0025><U0054>"
-am_pm   "";""
-t_fmt_ampm ""
-date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+%
+% Appropriate time representation (%X)
+%       "%r"
+t_fmt   "<U0025><U0072>"
+%
+% Strings for AM/PM
+%
+am_pm   "<U03c0><U03bc>";"<U03bc><U03bc>"
+%
+% Appropriate AM/PM time representation (%r)
+%       "%r"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
+%
+% Appropriate date representation (date(1))   "%a %d %b %Y %r %Z"
+date_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
 END LC_TIME
 
 LC_PAPER