Restore a day of the week in date(1) output for Japanese locales.

It was lost by recent locale change.

4 files changed, 17 insertions, 6 deletions

diff --git a/share/timedef/ja_JP.SJIS.src b/share/timedef/ja_JP.SJIS.src
index 3c96a37..f5a6bff 100644
--- a/share/timedef/ja_JP.SJIS.src
+++ b/share/timedef/ja_JP.SJIS.src
@@ -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月
diff --git a/share/timedef/ja_JP.UTF-8.src b/share/timedef/ja_JP.UTF-8.src
index ea2fcbe..afa495f 100644
--- a/share/timedef/ja_JP.UTF-8.src
+++ b/share/timedef/ja_JP.UTF-8.src
@@ -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譛�
diff --git a/share/timedef/ja_JP.eucJP.src b/share/timedef/ja_JP.eucJP.src
index f98c832..3e231cd 100644
--- a/share/timedef/ja_JP.eucJP.src
+++ b/share/timedef/ja_JP.eucJP.src
@@ -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ｷ�
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);