From patchwork Wed Apr 13 04:30:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 11722 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 45409 invoked by alias); 13 Apr 2016 04:30:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 45345 invoked by uid 89); 13 Apr 2016 04:30:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1430, telephone X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Cc: keld@keldix.com Subject: [PATCH] locale: ld-telephone: update to ISO-14652 2002 Date: Wed, 13 Apr 2016 00:30:35 -0400 Message-Id: <1460521835-25010-1-git-send-email-vapier@gentoo.org> 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 --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"));