[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 12/36] localedata: add AM/PM strings to cy_GB and en_GB



From: Jakub Jelink <jakub@redhat.com>
Date: Thu, 16 Feb 2006 01:33:08 -0600

Upstream sayeth (subject "Re: libc/3856", 2002-06-22):

| Not filling in the am/pm strings is a mean to say that the
| people in the country the locale is fow are not to backward
| as to use the am/pm format anymore.  This definitely is the
| case for the UK.
|
| THe am/pm strings will only be set if this is the official
| notation.  It's unfortunately the case in the US and I have
| strong hopes nobody else is following this horrible example.
|  It is not enough if the format is used by some media
| companies (which can be US dominated).
|
| So your task: fix all the broken programs which have
| problems with no am/pm format being available and provide
| proff that Australia really officially uses the am/pm format.

Michael Graham reports by contrast that although 24h time is now the
preferred format but he and many other people in the UK still prefer
to see AM/PM time, and the "date" utility's %p specifier does not work
without this.

>From fedora glibc-2.3.3-57 (2004-09-25) and perhaps earlier.  That
the patch is by Jakub is just a guess.

Fixes: http://bugs.debian.org/240901
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 localedata/locales/cy_GB |    7 +++++--
 localedata/locales/en_GB |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 9615c3f..0415e78 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
 d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
 t_fmt       "<U0025><U0054>"
-am_pm       "";""
-t_fmt_ampm  ""
+am_pm       "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+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>"
 END LC_TIME
 
 LC_MESSAGES
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 6a81d6d..32a4e6c 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
 d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt       "<U0025><U0054>"
-am_pm       "";""
-t_fmt_ampm  ""
+am_pm       "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
 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>"
-- 
1.7.5.1


Reply to: