X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Koha%2FDateUtils.pm;h=4ffc1603dff5fb62693269f746074b7bc575221d;hb=11546a2ee1480e7f9a596652b81a6d1fe9564e39;hp=b2c1df8c8acb942ca4cecb7ce497ad1953df8e3b;hpb=374b6f4b9f33a776d04cdaa696b40e8e033dda32;p=koha.git diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm index b2c1df8c8a..4ffc1603df 100644 --- a/Koha/DateUtils.pm +++ b/Koha/DateUtils.pm @@ -101,11 +101,15 @@ or C if C was provided. A second parameter allows overriding of the syspref value. This is for testing only In usage use the DateTime objects own methods for non standard formatting +A third parameter allows to specify if the output format contains the hours and minutes. +If it is not defined, the default value is 0; + =cut sub output_pref { my $dt = shift; - my $force_pref = shift; # if testing we want to override Context + my $force_pref = shift; # if testing we want to override Context + my $dateonly = shift || 0; # if you don't want the hours and minutes return unless defined $dt; @@ -113,16 +117,24 @@ sub output_pref { defined $force_pref ? $force_pref : C4::Context->preference('dateformat'); given ($pref) { when (/^iso/) { - return $dt->strftime('%Y-%m-%d %H:%M'); + return $dateonly + ? $dt->strftime('%Y-%m-%d') + : $dt->strftime('%Y-%m-%d %H:%M'); } when (/^metric/) { - return $dt->strftime('%d/%m/%Y %H:%M'); + return $dateonly + ? $dt->strftime('%d/%m/%Y') + : $dt->strftime('%d/%m/%Y %H:%M'); } when (/^us/) { - return $dt->strftime('%m/%d/%Y %H:%M'); + return $dateonly + ? $dt->strftime('%m/%d/%Y') + : $dt->strftime('%m/%d/%Y %H:%M'); } default { - return $dt->strftime('%Y-%m-%d %H:%M'); + return $dateonly + ? $dt->strftime('%Y-%m-%d') + : $dt->strftime('%Y-%m-%d %H:%M'); } }