Message ID | 1460746380-20799-1-git-send-email-vapier@gentoo.org |
---|---|
State | New |
Headers | show |
+1 for standards compliance +1 for useful fields Field descriptors for the "postal_fmt" keyword: %n - Person’s name, possibly constructed with the LC_NAME "name_fmt" keyword. %l - Local township within town or city On Fri, Apr 15, 2016 at 2:53 PM, Mike Frysinger <vapier@gentoo.org> wrote: > ISO 14652/30112 includes %l & %n now, so permit them in our files. > --- > locale/programs/ld-address.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c > index f133319..bfbdd62 100644 > --- a/locale/programs/ld-address.c > +++ b/locale/programs/ld-address.c > @@ -150,8 +150,8 @@ No definition for %s category found"), "LC_ADDRESS")); > } > else > { > - /* We must check whether the format string contains only the > - allowed escape sequences. */ > + /* We must check whether the format string contains only the allowed > + escape sequences. Last checked against ISO 30112 WD10 [2014]. */ > const char *cp = address->postal_fmt; > > if (*cp == '\0') > @@ -165,7 +165,7 @@ No definition for %s category found"), "LC_ADDRESS")); > if (*++cp == 'R') > /* Romanize-flag. */ > ++cp; > - if (strchr ("afdbshNtreCzTSc%", *cp) == NULL) > + if (strchr ("nafdbshNtreClzTSc%", *cp) == NULL) > { > WITH_CUR_LOCALE (error (0, 0, _("\ > %s: invalid escape `%%%c' sequence in field `%s'"), > -- > 2.7.4 >
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index f133319..bfbdd62 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -150,8 +150,8 @@ No definition for %s category found"), "LC_ADDRESS")); } else { - /* We must check whether the format string contains only the - allowed escape sequences. */ + /* We must check whether the format string contains only the allowed + escape sequences. Last checked against ISO 30112 WD10 [2014]. */ const char *cp = address->postal_fmt; if (*cp == '\0') @@ -165,7 +165,7 @@ No definition for %s category found"), "LC_ADDRESS")); if (*++cp == 'R') /* Romanize-flag. */ ++cp; - if (strchr ("afdbshNtreCzTSc%", *cp) == NULL) + if (strchr ("nafdbshNtreClzTSc%", *cp) == NULL) { WITH_CUR_LOCALE (error (0, 0, _("\ %s: invalid escape `%%%c' sequence in field `%s'"),