From aebff6f6de1c4f217c7a03ce779fd80b36ce7ec9 Mon Sep 17 00:00:00 2001
From: ume <ume@FreeBSD.org>
Date: Sun, 20 Dec 2015 14:59:30 +0000
Subject: Restore a day of the week in date(1) output for Japanese locales. It
 was lost by recent locale change.

---
 tools/tools/locale/tools/cldr2def.pl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index d26cb2e..fae7c91 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -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"		=> "<cformat<d_t_fmt<s",
 	    "am_pm"		=> "as",
 	    "d_fmt"		=> "s",
-	    "d_t_fmt"		=> "s",
+	    "d_t_fmt"		=> "<dtformat<d_t_fmt<s",
 	    "altmon"		=> "<altmon<mon<as",
 	    "md_order"		=> "<mdorder<d_fmt<s",
 	    "t_fmt_ampm"	=> "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);
-- 
cgit v1.1