From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 13 Apr 2016 04:14:30 +0000 (-0400)
Subject: locale: ld-telephone: update to ISO-30112 2014
X-Git-Tag: glibc-2.24~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49;p=thirdparty%2Fglibc.git

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 92d55575980..a4cffe7d851 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 6c38449d2c1..e54afc941e2 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"));