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�N%m��%e�� %H:%M:%S %Z
+%Y�N%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" => "<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);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
