From 2f6c72d36aa97807def837d1399cd69d6719c0dd Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Sun, 1 Jul 2012 14:36:06 +1200 Subject: [PATCH] Bug 8231 : Follow to fix date formatting --- circ/returns.pl | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index 7face0f..b96aa7b 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -46,7 +46,6 @@ use C4::Koha; # FIXME : is it still useful ? use C4::RotatingCollections; use Koha::DateUtils; use Koha::Calendar; -use C4::Dates qw/format_date/; my $query = new CGI; @@ -471,7 +470,7 @@ foreach my $code ( keys %$messages ) { $err{debarname} = "$borrower->{firstname} $borrower->{surname}"; } elsif ( $code eq 'PrevDebarred' ) { - $err{prevdebarred} = format_date( $messages->{'PrevDebarred'} ); + $err{prevdebarred} = $messages->{'PrevDebarred'}; } else { die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 4cbe9eb..fe19421 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -341,7 +341,7 @@ $(document).ready(function () {

[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %]) is now debarred until [% errmsgloo.debarred | $KohaDates %]

[% END %] [% IF ( errmsgloo.prevdebarred ) %] -

REMINDER: Patron is restricted until [% errmsgloo.prevdebarred %]

+

REMINDER: Patron is restricted until [% errmsgloo.prevdebarred | $KohaDates %]

[% END %] [% END %] [% IF ( soundon ) %] -- 1.7.10