aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-12 18:58:04 -0400
committerPetr Baudis <pasky@ucw.cz>2012-04-13 10:55:25 +0200
commitea32912bbc5ef89816a61b6d13e53403355f86a6 (patch)
tree19af58fb4656e30a1e457b900d6990edfd7120f0 /localedata
parent3507ac6af661c24ce009e5297e9b10f5a46b8022 (diff)
downloadglibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.zip
glibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.tar.gz
glibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.tar.bz2
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.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/locales/cy_GB7
-rw-r--r--localedata/locales/en_GB6
3 files changed, 14 insertions, 5 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0d1b93c..8ab851c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-12 Mike Frysinger <vapier@gentoo.org>
+
+ [BZ #3768]
+ * locales/en_GB (LC_TIME): Set am_pm and t_fmt_ampm fields.
+ * locales/cy_GB (LC_TIME): Likewise. Also copy date_fmt from en_GB.
+
2012-04-04 Jeff Law <law@redhat.com>
[BZ #6770]
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 9615c3f..aaffde9 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 6a81d6d..a80a334 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