From fb704ed49f90289be41a458d625581ca092bd921 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 21 Oct 2013 16:46:26 -0400 Subject: [PATCH] Bug 10493 [QA follow-up] Add renewal script --- Koha/Template/Plugin/EncodeUTF8.pm | 31 ++++++++++++++++++++ circ/renew.pl | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 8 ++-- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 Koha/Template/Plugin/EncodeUTF8.pm diff --git a/Koha/Template/Plugin/EncodeUTF8.pm b/Koha/Template/Plugin/EncodeUTF8.pm new file mode 100644 index 0000000..17312cc --- /dev/null +++ b/Koha/Template/Plugin/EncodeUTF8.pm @@ -0,0 +1,31 @@ +package Koha::Template::Plugin::EncodeUTF8; + +# Copyright Bywater Solutions 2012 + +# This file is part of Koha. +# +# 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 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 +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use base qw( Template::Plugin::Filter ); + +use Encode qw{encode decode}; + +sub filter { + 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..fc584aa 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,6 @@ [% USE Koha %] [% USE KohaDates %] -[% USE KohaBranchName %] +[% USE EncodeUTF8 %] [% INCLUDE 'doc-head-open.inc' %] @@ -30,11 +30,11 @@ [% ELSIF error == "no_checkout" %] -

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

+

[% item.biblio.title | $EncodeUTF8 %] [% item.biblioitem.subtitle | $EncodeUTF8 %] ( [% 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 %] )

+

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

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