From ea32912bbc5ef89816a61b6d13e53403355f86a6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 12 Apr 2012 18:58:04 -0400
Subject: cy_GB/en_GB: set am/pm in times

The British people apparently use am/pm in time, so make it available to
them.  While we're here, sync the date_fmt field from en_GB to cy_GB.

Fedora has been carrying this for the better part of a decade, and Debian
has had it, and now that I've gotten a request from some British people
to add it to Gentoo, I'd rather get it merged into mainline.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2012-04-12  Mike Frysinger  <vapier@gentoo.org>

	[BZ #3768]
	* locales/en_GB: Set am_pm and t_fmt_ampm fields.
	* locales/cy_GB: Likewise.  Also copy date_fmt from en_GB.
---
 localedata/locales/cy_GB | 7 +++++--
 localedata/locales/en_GB | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'localedata/locales')

diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 9615c3f4ef..aaffde9f76 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       "<U0061><U006D>";"<U0070><U006D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
+<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 6a81d6d659..a80a334a68 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -116,9 +116,9 @@ 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  ""
-date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+am_pm       "<U0061><U006D>";"<U0070><U006D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 week    7;19971130;4
-- 
cgit 1.4.1