From 3aef0257f4d2c8f4c7b40ad564ada5d2e8bd0cf2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 3 Apr 2015 10:02:04 -0400 Subject: [PATCH] Bug 8236: (QA followup) Tweak language, fix whitespace error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Joonas Kylmälä --- .../prog/en/modules/admin/preferences/circulation.pref | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- t/db_dependent/Circulation.t | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 06516c16fe..a936d813fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -400,13 +400,13 @@ Circulation: - If enabled, the number of checkouts allowed will be normal checkouts + on-site checkouts. - If disabled, both values will be checked separately. - - - When a patron's checked out item is late, + - When a patron's checked out item is overdue, - pref: OverduesBlockRenewing type: choice choices: allow: allow renewing. blockitem: block renewing only for this item. - block: block renewing for all his items. + block: block renewing for all the patron's items. - - If patron is restricted, - pref: RestrictionBlockRenewing diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 584e50fea5..4bb2632280 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -239,7 +239,7 @@ [% ELSIF ( ISSUE.too_many ) %] Not renewable [% ELSIF ( ISSUE.norenew_overdue ) %] - Not allowed (overdue on a document) + Not allowed (overdue) [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %] Automatic renewal ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) @@ -475,7 +475,7 @@ [% END %] ([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining) [% ELSIF ( OVERDUE.norenew_overdue ) %] - Not allowed(overdue on a document) + Not allowed(overdue) [% ELSIF ( OVERDUE.onreserve ) %] On hold [% ELSE %] diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 031b4c7b5a..31ed7dfdd4 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -378,7 +378,6 @@ C4::Context->dbh->do("DELETE FROM accountlines"); ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1); is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1'); - # Items can't fill hold for reasons ModItem({ notforloan => 1 }, $biblionumber, $itemnumber); ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1); -- 2.39.5