localedef: change week_1stweek default to 7

The ISO 14652/30112 specs say the defaults for the week keyword are:
	7, 19971130, 7

The localedef has been using those defaults for the first two, but
0 for the last one.

diff --git a/ChangeLog b/ChangeLog
index 79bfb734453982f96c79cde39cb58d818441bf8c..5cd8c4012bdcb076736c3899c435195be5045ded 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-23  Mike Frysinger  <vapier@gentoo.org>
+
+       * locale/programs/ld-time.c (time_finish): Set week_1stweek to 7
+       when it is the default of 0.
+
 2016-04-22  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/locale-defines.sym:  Add new macros.

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index ca31c9c81b2ef832e21849fefef44e473e24c3b1..87531bc54344a06909d8c0a5a1a447750baf5ca3 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -487,12 +487,16 @@ No definition for %s category found"), "LC_TIME"));
        }
     }
 
+  /* Set up defaults based on ISO 30112 WD10 [2014].  */
   if (time->week_ndays == 0)
     time->week_ndays = 7;
 
   if (time->week_1stday == 0)
     time->week_1stday = 19971130;
 
+  if (time->week_1stweek == 0)
+    time->week_1stweek = 7;
+
   if (time->week_1stweek > time->week_ndays)
     WITH_CUR_LOCALE (error (0, 0, _("\
 %s: third operand for value of field `%s' must not be larger than %d"),