This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-206-g7c84d5c
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Apr 2016 07:33:39 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-206-g7c84d5c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49 (commit)
from 3544cbc8f43b5f05fb89d22ef7edbb6ad0594311 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49
commit 7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Apr 13 00:14:30 2016 -0400
locale: ld-telephone: update to ISO-30112 2014
The newer version of the standard adds %C %e %t to tel_int_fmt and
tel_dom_fmt. Make sure localedef accepts them.
Also change the default tel_int_fmt to include %t per the standard.
diff --git a/ChangeLog b/ChangeLog
index 92d5557..a4cffe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-16 Mike Frysinger <vapier@gentoo.org>
+
+ * locale/programs/ld-telephone.c (telephone_finish): Add %t to the
+ default tel_int_fmt. Add "Cet" to strchr check on tel_int_fmt and
+ tel_dom_fmt.
+
2016-04-15 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile:
diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c
index 6c38449..e54afc9 100644
--- a/locale/programs/ld-telephone.c
+++ b/locale/programs/ld-telephone.c
@@ -105,7 +105,7 @@ No definition for %s category found"), "LC_TELEPHONE"));
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
"LC_TELEPHONE", "tel_int_fmt"));
/* Use as the default value the value of the i18n locale. */
- telephone->tel_int_fmt = "+%c %a %l";
+ telephone->tel_int_fmt = "+%c %a%t%l";
}
else
{
@@ -121,7 +121,7 @@ No definition for %s category found"), "LC_TELEPHONE"));
{
if (*cp == '%')
{
- if (strchr ("aAlc", *++cp) == NULL)
+ if (strchr ("aAcCelt", *++cp) == NULL)
{
WITH_CUR_LOCALE (error (0, 0, _("\
%s: invalid escape sequence in field `%s'"), "LC_TELEPHONE", "tel_int_fmt"));
@@ -144,7 +144,7 @@ No definition for %s category found"), "LC_TELEPHONE"));
{
if (*cp == '%')
{
- if (strchr ("aAlc", *++cp) == NULL)
+ if (strchr ("aAcCelt", *++cp) == NULL)
{
WITH_CUR_LOCALE (error (0, 0, _("\
%s: invalid escape sequence in field `%s'"), "LC_TELEPHONE", "tel_dom_fmt"));
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
locale/programs/ld-telephone.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources