localedef: allow %l/%n in postal_fmt [BZ #16983]

ISO 14652/30112 includes %l & %n now, so permit them in our files.

diff --git a/ChangeLog b/ChangeLog
index a4cffe7d851aa06a4c0a68253082f172c651135c..194be7bf899944ac0c61b9e97c466b3d5899463e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-16  Mike Frysinger  <vapier@gentoo.org>
+
+       [BZ #16983]
+       * locale/programs/ld-address.c (address_finish): Update postal_fmt
+       comment.  Add "ln" to strchr check on postal_fmt.
+
 2016-04-16  Mike Frysinger  <vapier@gentoo.org>
 
        * locale/programs/ld-telephone.c (telephone_finish): Add %t to the

diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index f13331941ea73353ebba6993a72f2ac6295cd461..bfbdd623bc598877722f8e60c67f40a55f4e5aa7 100644 (file)
--- 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'"),