about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-04-13 00:14:30 -0400
committerMike Frysinger <vapier@gentoo.org>2016-04-16 03:33:30 -0400
commit7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49 (patch)
tree1809074e69a0d1dcc447fae857eb1f2277712f23 /locale
parent3544cbc8f43b5f05fb89d22ef7edbb6ad0594311 (diff)
downloadglibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.tar.gz
glibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.tar.xz
glibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.zip
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.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-telephone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c
index 6c38449d2c..e54afc941e 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"));