Merge branch 'bug_9912' into 3.12-master
This commit is contained in:
commit
67573c9cdf
1 changed files with 5 additions and 3 deletions
|
@ -29,7 +29,9 @@ cmp_ok $date_string, 'eq', '2011-06-16 12:00', 'iso output';
|
|||
$date_string = output_pref( $dt, 'iso', '12hr' );
|
||||
cmp_ok $date_string, 'eq', '2011-06-16 12:00 PM', 'iso output 12hr';
|
||||
|
||||
$date_string = output_pref( $dt, 'iso', undef, 1 );
|
||||
# "notime" doesn't actually mean anything in this context, but we
|
||||
# can't pass undef or output_pref will try to access the database
|
||||
$date_string = output_pref( $dt, 'iso', 'notime', 1 );
|
||||
cmp_ok $date_string, 'eq', '2011-06-16', 'iso output (date only)';
|
||||
|
||||
$date_string = output_pref( $dt, 'us', '24hr' );
|
||||
|
@ -38,14 +40,14 @@ cmp_ok $date_string, 'eq', '06/16/2011 12:00', 'us output';
|
|||
$date_string = output_pref( $dt, 'us', '12hr' );
|
||||
cmp_ok $date_string, 'eq', '06/16/2011 12:00 PM', 'us output 12hr';
|
||||
|
||||
$date_string = output_pref( $dt, 'us', undef, 1 );
|
||||
$date_string = output_pref( $dt, 'us', 'notime', 1 );
|
||||
cmp_ok $date_string, 'eq', '06/16/2011', 'us output (date only)';
|
||||
|
||||
# metric should return the French Revolutionary Calendar Really
|
||||
$date_string = output_pref( $dt, 'metric', '24hr' );
|
||||
cmp_ok $date_string, 'eq', '16/06/2011 12:00', 'metric output';
|
||||
|
||||
$date_string = output_pref( $dt, 'metric', undef, 1 );
|
||||
$date_string = output_pref( $dt, 'metric', 'notime', 1 );
|
||||
cmp_ok $date_string, 'eq', '16/06/2011', 'metric output (date only)';
|
||||
|
||||
$date_string = output_pref_due( $dt, 'metric', '24hr' );
|
||||
|
|
Loading…
Reference in a new issue