From 0e9c755d49f304df092f011be863cec5393b617c Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 3 Apr 2015 10:02:04 -0400
Subject: [PATCH] Bug 8236 [QA Followup] - Tweak language, fix whitespace error

---
 .../en/modules/admin/preferences/circulation.pref  |    4 ++--
 .../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 dc8061b..f77712d 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
@@ -399,13 +399,13 @@ Circulation:
                   no: Disable
             - the on-site for all cases (Even if a user is debarred, etc.).
         -
-            - 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 2bca720..41c6238 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -231,7 +231,7 @@
                                                     [% ELSIF ( ISSUE.too_many ) %]
                                                         Not renewable
                                                     [% ELSIF ( ISSUE.norenew_overdue ) %]
-                                                        Not allowed <span class="renewals">(overdue on a document)</span>
+                                                        Not allowed <span class="renewals">(overdue)</span>
                                                     [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
                                                         Automatic renewal
                                                         <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
@@ -466,7 +466,7 @@
                                                             [% END %]
                                                                 <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
                                                         [% ELSIF ( OVERDUE.norenew_overdue ) %]
-                                                            Not allowed<span class="renewals">(overdue on a document)</span>
+                                                            Not allowed<span class="renewals">(overdue)</span>
                                                         [% ELSIF ( OVERDUE.onreserve ) %]
                                                             On hold
                                                         [% ELSE %]
diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
index 2fa07c7..384187d 100755
--- a/t/db_dependent/Circulation.t
+++ b/t/db_dependent/Circulation.t
@@ -362,7 +362,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);
-- 
1.7.2.5