Attachment 42007 Details for Bug 8236 – Bug 8236 [QA Followup] - Tweak language, fix whitespace error

[patch] Bug 8236 [QA Followup] - Tweak language, fix whitespace error

Bug-8236-QA-Followup---Tweak-language-fix-whitespa.patch (text/plain), 4.18 KB, created by Joonas Kylmälä on 2015-08-27 07:22:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joonas Kylmälä

Created: 2015-08-27 07:22:32 UTC

Size: 4.18 KB

patch

obsolete

>From 2e3ee5cccc40cc662192bd042c79f6e2985416ac 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
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Joonas KylmÃ¤lÃ¤ <j.kylmala@gmail.com>
>---
> .../intranet-tmpl/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 22483f0..6a2dc21 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
>@@ -392,13 +392,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 87204e0..8fc264b 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 (overdue on a document)
>+ Not allowed (overdue)
> [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
> Automatic renewal
> ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
>@@ -466,7 +466,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 a88a680..a32be83 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -379,7 +379,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.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 8236: 10230 | 11958 | 12362 | 12619 | 12727 | 12790 | 12791 | 13510 | 14433 | 17926 | 18071 | 18073 | 18507 | 18729 | 20716 | 20719 | 21163 | 21223 | 22264 | 22275 | 22280 | 34234 | 34322 | 35372 | 36674 | 36743 | 37407 | 37418 | 37457 | 37458 | 37459 | 41992 | 41993 | 41994 | 42007 | 43628