gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 8236: (QA followup) Tweak language, fix whitespace error 

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>
This commit is contained in:
Kyle M Hall 2015-04-03 10:02:04 -04:00 committed by Tomas Cohen Arazi
parent 70482a2e6b
commit 3aef0257f4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
View File

@ -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

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -239,7 +239,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>
@ -475,7 +475,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 %]

1
t/db_dependent/Circulation.t
View File

@ -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);