diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-04-13 00:14:30 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-16 03:33:30 -0400 |
| commit | 7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49 (patch) | |
| tree | 1809074e69a0d1dcc447fae857eb1f2277712f23 | |
| parent | 3544cbc8f43b5f05fb89d22ef7edbb6ad0594311 (diff) | |
| download | glibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.zip glibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.tar.gz glibc-7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49.tar.bz2 | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | locale/programs/ld-telephone.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -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")); |