From a79a1c704b32c48903a4cb4c0786eca828520b5c Mon Sep 17 00:00:00 2001
From: KH Teo <b3virq3b@gmail.com>
Date: Sat, 14 May 2011 19:47:43 -0400
Subject: Fix time format in en_SG locale

---
 NEWS                     |  6 +++---
 localedata/ChangeLog     |  6 ++++++
 localedata/locales/en_SG | 15 ++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 650fff8a35..4214c3c426 100644
--- a/NEWS
+++ b/NEWS
@@ -12,9 +12,9 @@ Version 2.14
   386, 11257, 11258, 11487, 11532, 11578, 11653, 11668, 11724, 11945, 11947,
   12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432, 12445,
   12449, 12454, 12460, 12469, 12489, 12509, 12510, 12511, 12518, 12527,
-  12541, 12545, 12551, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
-  12631, 12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714,
-  12717, 12723, 12724, 12734, 12738
+  12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625,
+  12626, 12631, 12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713,
+  12714, 12717, 12723, 12724, 12734, 12738
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index dd2b292f8b..8ea8c68859 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-14  Ulrich Drepper  <drepper@gmail.com>
+
+	[BZ #12582]
+	* localedata/charmaps/en_SG (LC_TIME): Fix time formats.
+	Patch by KH Teo <b3virq3b@gmail.com>.
+
 2011-05-09  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #11487]
diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
index 0e9196c1f9..71ae52b26a 100644
--- a/localedata/locales/en_SG
+++ b/localedata/locales/en_SG
@@ -117,19 +117,20 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";"<U0046><U0065><
 am_pm       "<U0041><U004D>";"<U0050><U004D>"
 %
 % Appropriate date and time representation
-% %A %d,%B,%Y %I:%M:%S  %Z
-d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U002C><U0025><U0042><U002C><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+% %a %d %b %Y %r
+d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072>"
 %
 % Appropriate date representation
-% %A %d,%B,%Y
-d_fmt       "<U0025><U0041><U0020><U0025><U0064><U002C><U0025><U0042><U002C><U0025><U0059>"
+% %d/%m/%Y
+d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 %
 % Appropriate time representation
-% %I:%M:%S  %Z
-t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
+% %T
+t_fmt       "<U0025><U0054>"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+% %I:%M:%S %p
+t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
 %
 END LC_TIME
 
-- 
cgit v1.2.3