lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-10-28 23:34:53 +03:00
Code Activity

localedef: change week_1stweek default to 7

Browse Source 
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.
This commit is contained in:
Mike Frysinger
2016-04-15 23:02:37 -04:00
parent 0a410e76f5
commit d088aa71f1
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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> 2016-04-22 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
* sysdeps/powerpc/locale-defines.sym: Add new macros. * sysdeps/powerpc/locale-defines.sym: Add new macros.

4
locale/programs/ld-time.c
View File

@@ -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) if (time->week_ndays == 0)
time->week_ndays = 7; time->week_ndays = 7;
if (time->week_1stday == 0) if (time->week_1stday == 0)
time->week_1stday = 19971130; time->week_1stday = 19971130;
if (time->week_1stweek == 0)
time->week_1stweek = 7;
if (time->week_1stweek > time->week_ndays) if (time->week_1stweek > time->week_ndays)
WITH_CUR_LOCALE (error (0, 0, _("\ WITH_CUR_LOCALE (error (0, 0, _("\
%s: third operand for value of field `%s' must not be larger than %d"), %s: third operand for value of field `%s' must not be larger than %d"),