diff mbox

locale: ld-telephone: update to ISO-14652 2002

Message ID 1460521835-25010-1-git-send-email-vapier@gentoo.org
State Committed
Delegated to: Mike Frysinger
Headers

Commit Message

Mike Frysinger April 13, 2016, 4:30 a.m. UTC 
  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.
---
 locale/programs/ld-telephone.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

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"));