diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | locale/programs/ld-telephone.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 92d5557598..a4cffe7d85 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 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")); |