picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

locale: ld-telephone: update to ISO-30112 2014

Browse source 
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.
This commit is contained in:
Mike Frysinger 2016-04-13 00:14:30 -04:00
parent 3544cbc8f4
commit 7c84d5ce26
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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:

6
locale/programs/ld-telephone.c
View file

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