From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 59641 invoked by alias); 16 Apr 2016 07:26:54 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 59626 invoked by uid 89); 16 Apr 2016 07:26:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:921 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH] localedef: change week_1stweek default to 7 Date: Sat, 16 Apr 2016 07:26:00 -0000 Message-Id: <1460791608-25677-1-git-send-email-vapier@gentoo.org> X-SW-Source: 2016-04/txt/msg00418.txt.bz2 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. --- locale/programs/ld-time.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index ca31c9c..87531bc 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"), -- 2.7.4