From f9223f70de4c65c9d63194739ee2f9f4633ee1f4 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Sun, 20 Oct 2013 19:04:35 -0400 Subject: [PATCH] Bug 10493 [QA follow-up] Add renewal script --- Koha/Template/Plugin/Koha.pm | 6 ++++++ circ/renew.pl | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 7 +++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Koha/Template/Plugin/Koha.pm b/Koha/Template/Plugin/Koha.pm index 2eff9f1..bdc715e 100644 --- a/Koha/Template/Plugin/Koha.pm +++ b/Koha/Template/Plugin/Koha.pm @@ -20,6 +20,7 @@ package Koha::Template::Plugin::Koha; use Modern::Perl; use base qw( Template::Plugin ); +use Encode qw{encode decode}; use C4::Context; @@ -44,4 +45,9 @@ sub Preference { return C4::Context->preference( $pref ); } +sub Encode { + my ( $self, $value ) = @_; + return encode( 'UTF-8', $value ); +} + 1; diff --git a/circ/renew.pl b/circ/renew.pl index 6634c0c..5085a00 100755 --- a/circ/renew.pl +++ b/circ/renew.pl @@ -6,7 +6,7 @@ # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later +# Foundation; either version 3 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index fe090b5..32d9f58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -1,6 +1,5 @@ [% USE Koha %] [% USE KohaDates %] -[% USE KohaBranchName %] [% INCLUDE 'doc-head-open.inc' %] @@ -30,11 +29,11 @@ [% ELSIF error == "no_checkout" %] -

[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) is not checked out to a patron.

+

[% Koha.Encode( item.biblio.title ) %] [% Koha.Encode( item.biblioitem.subtitle ) %] ( [% item.barcode %] ) is not checked out to a patron.

[% ELSIF error == "too_many" %] -

[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been renewed the maximum number of times by [% borrower.firstname %] [% borrower.surname %] ( [% borrower.cardnumber %] )

+

[% Koha.Encode( item.biblio.title ) %] [% Koha.Encode( item.biblioitem.subtitle ) %] ( [% item.barcode %] ) has been renewed the maximum number of times by [% borrower.firstname %] [% borrower.surname %] ( [% borrower.cardnumber %] )

[% IF Koha.Preference('AllowRenewalLimitOverride') %]
@@ -75,7 +74,7 @@