d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Prefer to use %d over %e where the day of the month should be zero

Browse Source 
filled.
- Since %e means the day of the month as well, regard %e as same as %d
  in md_order.

Reported by:	vangyzen
Approved by:	re (gjb)
This commit is contained in:
Hajimu UMEMOTO 2016-06-19 03:44:32 +00:00
parent ee61689fdf
commit 47a8356221
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=302016
46 changed files with 95 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/timedef/ar_JO.UTF-8.src
View File

@ -80,7 +80,7 @@
كانون الأول
#
# md_order
m
dm
#
# ampm_fmt
%OI:%OM:%OS %p

2
share/timedef/ar_MA.UTF-8.src
View File

@ -80,7 +80,7 @@
دجنبر
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

2
share/timedef/ar_SA.UTF-8.src
View File

@ -80,7 +80,7 @@
ديسمبر
#
# md_order
m
dm
#
# ampm_fmt
%OI:%OM:%OS %p

4
share/timedef/be_BY.CP1131.src
View File

@ -53,7 +53,7 @@
%H.%M.%S
#
# x_fmt
%e.%m.%y
%d.%m.%y
#
# c_fmt
%A %e %B %Y %H.%M.%S
@ -80,7 +80,7 @@
á­¥¦ ­ì
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/be_BY.CP1251.src
View File

@ -53,7 +53,7 @@
%H.%M.%S
#
# x_fmt
%e.%m.%y
%d.%m.%y
#
# c_fmt
%A %e %B %Y %H.%M.%S
@ -80,7 +80,7 @@
ñíåæàíü
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/be_BY.ISO8859-5.src
View File

@ -53,7 +53,7 @@
%H.%M.%S
#
# x_fmt
%e.%m.%y
%d.%m.%y
#
# c_fmt
%A %e %B %Y %H.%M.%S
@ -80,7 +80,7 @@
áÝÕÖÐÝì
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/be_BY.UTF-8.src
View File

@ -53,7 +53,7 @@
%H.%M.%S
#
# x_fmt
%e.%m.%y
%d.%m.%y
#
# c_fmt
%A %e %B %Y %H.%M.%S
@ -80,7 +80,7 @@
снежань
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/bg_BG.CP1251.src
View File

@ -53,7 +53,7 @@
%H:%M:%S
#
# x_fmt
%e.%m.%y г.
%d.%m.%y г.
#
# c_fmt
%A %e %B %Y ã. %H:%M:%S
@ -80,7 +80,7 @@
äåêåìâðè
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/bg_BG.UTF-8.src
View File

@ -53,7 +53,7 @@
%H:%M:%S
#
# x_fmt
%e.%m.%y г.
%d.%m.%y г.
#
# c_fmt
%A %e %B %Y г. %H:%M:%S
@ -80,7 +80,7 @@
декември
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/ca_IT.ISO8859-15.src
View File

@ -53,7 +53,7 @@ dissabte
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B de %Y, %H:%M:%S
@ -80,7 +80,7 @@ de novembre
de desembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/ca_IT.UTF-8.src
View File

@ -53,7 +53,7 @@ dissabte
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B de %Y, %H:%M:%S
@ -80,7 +80,7 @@ de novembre
de desembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/el_GR.ISO8859-7.src
View File

@ -53,7 +53,7 @@
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y - %I:%M:%S %p
@ -80,7 +80,7 @@
ÄåêÝìâñéïò
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/el_GR.UTF-8.src
View File

@ -53,7 +53,7 @@
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y - %I:%M:%S %p
@ -80,7 +80,7 @@
Δεκέμβριος
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/en_SG.UTF-8.src
View File

@ -53,7 +53,7 @@ Saturday
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y at %I:%M:%S %p
@ -80,7 +80,7 @@ November
December
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/en_US.UTF-8.src
View File

@ -53,7 +53,7 @@ Saturday
%I:%M:%S %p
#
# x_fmt
%m/%e/%y
%m/%d/%y
#
# c_fmt
%A, %B %e, %Y at %I:%M:%S %p
@ -80,7 +80,7 @@ November
December
#
# md_order
m
md
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/es_AR.ISO8859-1.src
View File

@ -53,7 +53,7 @@ s
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%e de %B de %Y, %I:%M:%S %p
@ -80,7 +80,7 @@ noviembre
diciembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/es_CR.UTF-8.src
View File

@ -53,7 +53,7 @@ sábado
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%e de %B de %Y, %I:%M:%S %p
@ -80,7 +80,7 @@ noviembre
diciembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/es_ES.ISO8859-15.src
View File

@ -53,7 +53,7 @@ s
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%e de %B de %Y, %H:%M:%S
@ -80,7 +80,7 @@ noviembre
diciembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/es_ES.UTF-8.src
View File

@ -53,7 +53,7 @@ sábado
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%e de %B de %Y, %H:%M:%S
@ -80,7 +80,7 @@ noviembre
diciembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/fi_FI.ISO8859-15.src
View File

@ -53,7 +53,7 @@ lauantaina
%H.%M.%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%e. %B %Y klo %H.%M.%S
@ -80,7 +80,7 @@ marraskuuta
joulukuuta
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/fi_FI.UTF-8.src
View File

@ -53,7 +53,7 @@ lauantaina
%H.%M.%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%e. %B %Y klo %H.%M.%S
@ -80,7 +80,7 @@ marraskuuta
joulukuuta
#
# md_order
m
dm
#
# ampm_fmt
%I.%M.%S %p

4
share/timedef/fr_BE.ISO8859-15.src
View File

@ -53,7 +53,7 @@ samedi
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y %H:%M:%S
@ -80,7 +80,7 @@ novembre
décembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/fr_BE.UTF-8.src
View File

@ -53,7 +53,7 @@ samedi
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y %H:%M:%S
@ -80,7 +80,7 @@ novembre
décembre
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/he_IL.UTF-8.src
View File

@ -53,7 +53,7 @@
%H:%M:%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%e ב%B %Y בשעה %H:%M:%S
@ -80,7 +80,7 @@
דצמבר
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/hi_IN.ISCII-DEV.src
View File

@ -53,7 +53,7 @@
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y ³å %I:%M:%S %p
@ -80,7 +80,7 @@
ÄÛ×¢ÊÏ
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/hi_IN.UTF-8.src
View File

@ -53,7 +53,7 @@
%I:%M:%S %p
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y को %I:%M:%S %p
@ -80,7 +80,7 @@
दिसंबर
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/is_IS.ISO8859-15.src
View File

@ -53,7 +53,7 @@ laugardagur
%H:%M:%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%e. %B %Y kl. %H:%M:%S
@ -80,7 +80,7 @@ n
desember
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/is_IS.UTF-8.src
View File

@ -53,7 +53,7 @@ laugardagur
%H:%M:%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%e. %B %Y kl. %H:%M:%S
@ -80,7 +80,7 @@ nóvember
desember
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

2
share/timedef/ko_KR.UTF-8.src
View File

@ -80,7 +80,7 @@
12월
#
# md_order
m
md
#
# ampm_fmt
%p %I:%M:%S

2
share/timedef/ko_KR.eucKR.src
View File

@ -80,7 +80,7 @@
12¿ù
#
# md_order
m
md
#
# ampm_fmt
%p %I:%M:%S

4
share/timedef/nl_BE.UTF-8.src
View File

@ -53,7 +53,7 @@ zaterdag
%H:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%A %e %B %Y %H:%M:%S
@ -80,7 +80,7 @@ november
december
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

2
share/timedef/sl_SI.ISO8859-2.src
View File

@ -80,7 +80,7 @@ november
december
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

2
share/timedef/sl_SI.UTF-8.src
View File

@ -80,7 +80,7 @@ november
december
#
# md_order
m
dm
#
# ampm_fmt
%I:%M:%S %p

4
share/timedef/sr_Cyrl_RS.ISO8859-5.src
View File

@ -87,7 +87,7 @@ subota
%H.%M.%S""%H.%M.%S
#
# x_fmt
%e.%m.%y.""%e.%m.%y.
%d.%m.%y.""%e.%m.%y.
#
# c_fmt
%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z
@ -126,7 +126,7 @@ novembar
decembar
#
# md_order
mm
dmdm
#
# ampm_fmt
%I.%M.%S %p""%I.%M.%S %p

4
share/timedef/sr_Latn_RS.ISO8859-2.src
View File

@ -87,7 +87,7 @@ subota
%H.%M.%S""%H.%M.%S
#
# x_fmt
%e.%m.%y.""%e.%m.%y.
%d.%m.%y.""%d.%m.%y.
#
# c_fmt
%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z
@ -126,7 +126,7 @@ novembar
decembar
#
# md_order
mm
dmdm
#
# ampm_fmt
%I.%M.%S %p""%I.%M.%S %p

4
share/timedef/sr_Latn_RS.UTF-8.src
View File

@ -87,7 +87,7 @@ subota
%H.%M.%S""%H.%M.%S
#
# x_fmt
%e.%m.%y.""%e.%m.%y.
%d.%m.%y.""%d.%m.%y.
#
# c_fmt
%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z
@ -126,7 +126,7 @@ novembar
decembar
#
# md_order
mm
dmdm
#
# ampm_fmt
%I.%M.%S %p""%I.%M.%S %p

4
share/timedef/tr_TR.ISO8859-9.src
View File

@ -53,7 +53,7 @@ Cumartesi
%H:%M:%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%A %e %B %Y %H:%M:%S
@ -80,7 +80,7 @@ Kas
Aralýk
#
# md_order
m
dm
#
# ampm_fmt
%p %I:%M:%S

4
share/timedef/tr_TR.UTF-8.src
View File

@ -53,7 +53,7 @@ Cumartesi
%H:%M:%S
#
# x_fmt
%e.%m.%Y
%d.%m.%Y
#
# c_fmt
%A %e %B %Y %H:%M:%S
@ -80,7 +80,7 @@ Kasım
Aralık
#
# md_order
m
dm
#
# ampm_fmt
%p %I:%M:%S

4
share/timedef/zh_Hans_CN.GB2312.src
View File

@ -53,7 +53,7 @@ PGFZAy
%p%I:%M:%S
#
# x_fmt
%y#/%m#/%e
%y#/%m#/%d
#
# c_fmt
%YDj%mTB%eHU %p%I:%M:%S
@ -80,7 +80,7 @@ J.R;TB
J.6~TB
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hans_CN.GBK.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%y/%m/%e
%y/%m/%d
#
# c_fmt
%Y年%m月%e日 %p%I:%M:%S
@ -80,7 +80,7 @@
十二月
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hans_CN.UTF-8.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%y/%m/%e
%y/%m/%d
#
# c_fmt
%Y年%m月%e日 %p%I:%M:%S
@ -80,7 +80,7 @@
十二月
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hans_CN.eucCN.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%y£¯%m£¯%e
%y£¯%m£¯%d
#
# c_fmt
%Y年%m月%e日 %p%I:%M:%S
@ -80,7 +80,7 @@
十二月
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hant_HK.UTF-8.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%e/%m/%y
%d/%m/%y
#
# c_fmt
%Y年%m月%e日 %p%I:%M:%S [%Z]
@ -80,7 +80,7 @@
12月
#
# md_order
m
dm
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hant_TW.Big5.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%Y¢A%m¢A%e
%Y¢A%m¢A%d
#
# c_fmt
%Y¦~%m¤ë%e¤é %p%I:%M:%S [%Z]
@ -80,7 +80,7 @@
¢°¢±¤ë
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

4
share/timedef/zh_Hant_TW.UTF-8.src
View File

@ -53,7 +53,7 @@
%p%I:%M:%S
#
# x_fmt
%Y/%m/%e
%Y/%m/%d
#
# c_fmt
%Y年%m月%e日 %p%I:%M:%S [%Z]
@ -80,7 +80,7 @@
12月
#
# md_order
m
md
#
# ampm_fmt
%p%I:%M:%S

15
tools/tools/locale/tools/cldr2def.pl
View File

@ -68,6 +68,7 @@ my %callback = (
mdorder => \&callback_mdorder,
altmon => \&callback_altmon,
cformat => \&callback_cformat,
dformat => \&callback_dformat,
dtformat => \&callback_dtformat,
cbabmon => \&callback_abmon,
cbampm => \&callback_ampm,
@ -183,10 +184,9 @@ if ($TYPE eq "timedef") {
"abday" => "as",
"day" => "as",
"t_fmt" => "s",
"d_fmt" => "s",
"d_fmt" => "<dformat<d_fmt<s",
"c_fmt" => "<cformat<d_t_fmt<s",
"am_pm" => "<cbampm<am_pm<as",
"d_fmt" => "s",
"d_t_fmt" => "<dtformat<d_t_fmt<s",
"altmon" => "<altmon<mon<as",
"md_order" => "<mdorder<d_fmt<s",
@ -225,6 +225,14 @@ sub callback_cformat {
return $s;
};
sub callback_dformat {
my $s = shift;
$s =~ s/(%m(<SOLIDUS>|[-.]))%e/$1%d/;
$s =~ s/%e((<SOLIDUS>|[-.])%m)/%d$1/;
return $s;
};
sub callback_dtformat {
my $s = shift;
my $nl = $callback{data}{l} . "_" . $callback{data}{c};
@ -241,7 +249,8 @@ sub callback_dtformat {
sub callback_mdorder {
my $s = shift;
return undef if (!defined $s);
$s =~ s/[^dm]//g;
$s =~ s/[^dem]//g;
$s =~ s/e/d/g;
return $s;
};