diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-04-12 18:58:04 -0400 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2012-04-13 10:55:25 +0200 |
| commit | ea32912bbc5ef89816a61b6d13e53403355f86a6 (patch) | |
| tree | 19af58fb4656e30a1e457b900d6990edfd7120f0 | |
| parent | 3507ac6af661c24ce009e5297e9b10f5a46b8022 (diff) | |
| download | glibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.tar.gz glibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.tar.xz glibc-ea32912bbc5ef89816a61b6d13e53403355f86a6.zip | |
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.
| -rw-r--r-- | NEWS | 24 | ||||
| -rw-r--r-- | localedata/ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/locales/cy_GB | 7 | ||||
| -rw-r--r-- | localedata/locales/en_GB | 6 |
4 files changed, 26 insertions, 17 deletions
diff --git a/NEWS b/NEWS index 472b35e656..961eb0a280 100644 --- a/NEWS +++ b/NEWS @@ -10,18 +10,18 @@ Version 2.16 * The following bugs are resolved with this release: 174, 350, 369, 411, 706, 2074, 2541, 2547, 2548, 2551, 2552, 2553, 2554, - 2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3866, 3868, 3976, 3992, - 4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, - 6730, 6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135, - 10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365, - 11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526, 13527, - 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, - 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673, - 13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761, 13786, - 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, - 13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910, 13911, - 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926, - 13928, 13938, 13963, 13967 + 2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3768, 3866, 3868, 3976, + 3992, 4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, + 6649, 6730, 6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, + 10135, 10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, + 11365, 11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526, + 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, + 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, + 13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761, + 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, + 13854, 13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910, + 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, + 13926, 13928, 13938, 13963, 13967 * ISO C11 support: diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 0d1b93cd3c..8ab851c2ce 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 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 |