diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/programs/ld-time.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 79bfb73445..5cd8c4012b 100644 --- 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 ca31c9c81b..87531bc543 100644 --- 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"), |