From owner-svn-src-all@freebsd.org Sun Dec 20 14:59:31 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9DBBA4DD2A; Sun, 20 Dec 2015 14:59:31 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7ABA41765; Sun, 20 Dec 2015 14:59:31 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBKExUHB064853; Sun, 20 Dec 2015 14:59:30 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBKExUGV064847; Sun, 20 Dec 2015 14:59:30 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201512201459.tBKExUGV064847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sun, 20 Dec 2015 14:59:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292512 - in head: share/timedef tools/tools/locale/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2015 14:59:31 -0000 Author: ume Date: Sun Dec 20 14:59:30 2015 New Revision: 292512 URL: https://svnweb.freebsd.org/changeset/base/292512 Log: Restore a day of the week in date(1) output for Japanese locales. It was lost by recent locale change. Modified: head/share/timedef/ja_JP.SJIS.src head/share/timedef/ja_JP.UTF-8.src head/share/timedef/ja_JP.eucJP.src head/tools/tools/locale/tools/cldr2def.pl Modified: head/share/timedef/ja_JP.SJIS.src ============================================================================== --- head/share/timedef/ja_JP.SJIS.src Sun Dec 20 13:41:06 2015 (r292511) +++ head/share/timedef/ja_JP.SJIS.src Sun Dec 20 14:59:30 2015 (r292512) @@ -63,7 +63,7 @@ 午後 # # date_fmt -%Y年%m月%e日 %H:%M:%S %Z +%Y年%m月%e日 %A %H:%M:%S %Z # # Long month names (without case ending) 1月 Modified: head/share/timedef/ja_JP.UTF-8.src ============================================================================== --- head/share/timedef/ja_JP.UTF-8.src Sun Dec 20 13:41:06 2015 (r292511) +++ head/share/timedef/ja_JP.UTF-8.src Sun Dec 20 14:59:30 2015 (r292512) @@ -56,14 +56,14 @@ %Y/%m/%d # # c_fmt -%Y蟷ｴ%m譛%e譌･ %H:%M:%S +%Y蟷ｴ%m譛%e譌･ %A %H:%M:%S # # AM/PM 蜊亥燕 蜊亥ｾ # # date_fmt -%Y蟷ｴ%m譛%e譌･ %H:%M:%S %Z +%Y蟷ｴ%m譛%e譌･ %A %H:%M:%S %Z # # Long month names (without case ending) 1譛 Modified: head/share/timedef/ja_JP.eucJP.src ============================================================================== --- head/share/timedef/ja_JP.eucJP.src Sun Dec 20 13:41:06 2015 (r292511) +++ head/share/timedef/ja_JP.eucJP.src Sun Dec 20 14:59:30 2015 (r292512) @@ -56,14 +56,14 @@ %Y/%m/%d # # c_fmt -%Yﾇｯ%mｷ%eﾆ %H:%M:%S +%Yﾇｯ%mｷ%eﾆ %A %H:%M:%S # # AM/PM ｸ眞ｰ ｸ盧 # # date_fmt -%Yﾇｯ%mｷ%eﾆ %H:%M:%S %Z +%Yﾇｯ%mｷ%eﾆ %A %H:%M:%S %Z # # Long month names (without case ending) 1ｷ Modified: head/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- head/tools/tools/locale/tools/cldr2def.pl Sun Dec 20 13:41:06 2015 (r292511) +++ head/tools/tools/locale/tools/cldr2def.pl Sun Dec 20 14:59:30 2015 (r292512) @@ -67,6 +67,7 @@ my %callback = ( mdorder => \&callback_mdorder, altmon => \&callback_altmon, cformat => \&callback_cformat, + dtformat => \&callback_dtformat, cbabmon => \&callback_abmon, data => undef, ); @@ -184,7 +185,7 @@ if ($TYPE eq "timedef") { "c_fmt" => " "as", "d_fmt" => "s", - "d_t_fmt" => "s", + "d_t_fmt" => " " " "s", @@ -201,6 +202,16 @@ sub callback_cformat { return $s; }; +sub callback_dtformat { + my $s = shift; + my $nl = $callback{data}{l} . "_" . $callback{data}{c}; + + if ($nl eq 'ja_JP') { + $s =~ s/(> )(%H)/$1%A $2/; + } + return $s; +}; + sub callback_mdorder { my $s = shift; return undef if (!defined $s);