Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Date/Language/French.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ our @MoYs = map { substr($_,0,3) } @MoY;
$MoYs[6] = 'jul';

our @AMPM = qw(AM PM);
our @Dsuf = ((qw(er e e e e e e e e e)) x 3, 'er');
our @Dsuf = ('e', 'er', ('e') x 30);

our ( %MoY, %DoW );
Date::Language::_build_lookups();
Expand All @@ -35,6 +35,6 @@ sub format_b { $MoYs[$_[0]->[4]] }
sub format_B { $MoY[$_[0]->[4]] }
sub format_h { $MoYs[$_[0]->[4]] }
sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
sub format_o { $_[0]->[3] }
sub format_o { sprintf("%2d%s",$_[0]->[3],$Dsuf[$_[0]->[3]]) }

1;
45 changes: 44 additions & 1 deletion t/format.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use Test::More tests => 202;
use Test::More tests => 242;
use Date::Format qw(ctime time2str);
use Date::Language;
use utf8;
Expand Down Expand Up @@ -125,6 +125,49 @@ German
%Oq III
%OY MCMXCIX
%Oy XCIX
French
%y 99
%Y 1999
%% %
%a mar
%A mardi
%b sep
%B septembre
%c 09/07/99 13:02:42
%C mar sep 7 13:02:42 GMT 1999
%d 07
%e 7
%D 09/07/99
%h sep
%H 13
%I 01
%j 250
%k 13
%l 1
%L 9
%m 09
%M 02
%o 7e
%p PM
%q 3
%r 01:02:42 PM
%R 13:02
%s 936709362
%S 42
%T 13:02:42
%U 36
%w 2
%W 36
%x 09/07/99
%X 13:02:42
%y 99
%Y 1999
%Z GMT
%z +0000
915192000 # Fri Jan 1 12:00:00 1999 GMT
%o 1er
%A vendredi
936709362 # Tue Sep 7 11:22:42 1999 GMT
Italian
%y 99
%Y 1999
Expand Down