From f3fa70edf4c01aa28a10dd741734b022228aba82 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 7 May 2020 15:16:35 +0000
Subject: [PATCH] Bug 24963: Terminology: Use "auto-renewal" instead of
alternatives
This patch updates terminology in the templates so that "auto-renewal"
is used instead of "auto renewal" or "autorenewal."
To test, apply the patch and set the 'AllowPatronToControlAutorenewal'
preference to "allow patrons."
- Log in to the OPAC and view the "your account" page.
- At the top of the "Checked out" tab you should see controls for
turning auto-renewals on and off. The labels should be correct.
- Turn off auto-renewals for this patron.
- In the staff interface, view the detail page for the patron you
updated in the previous step.
- In right-hand column of information about the patron you should see
"Auto-renewal: Patron has opted out."
- Add "&print=brief" to the page URL. Check that auto-renewal
information displays correctly on this brief view as well.
- Go to Administration -> System preferences.
- Under the "Circulation" tab, check that the description of the
OPACFineNoRenewalsBlockAutoRenew preference refers to
"auto-renewal."
- Under the "Patrons" tab, check the description of the
AllowPatronToControlAutorenewal refers to "auto-renewal."
---
.../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref | 2 +-
.../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++--
5 files changed, 6 insertions(+), 6 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 dbea85baab..35c258b653 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
@@ -486,7 +486,7 @@ Circulation:
choices:
yes: Block
no: Allow
- - their auto renewals.
+ - their auto-renewals.
-
- If a patron pays off all fines on an overdue item that is accruing fines
- pref: RenewAccruingItemWhenPaid
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index b9a0ee6261..13858bc151 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -84,7 +84,7 @@ Patrons:
choices:
yes: Allow patrons
no: Allow only staff
- - "to allow/disallow auto renewal for account. If allowed a patron will be able to update their own account to allow/disallow auto renewals"
+ - "to allow/disallow auto-renewal for account. If allowed a patron will be able to update their own account to allow/disallow auto renewals"
Membership expiry:
-
- When renewing borrowers, base the new expiry date on
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 2eded98efb..c2745dfa7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -84,7 +84,7 @@
<li><span class="label">Library: </span>[% patron.library.branchname | html %]</li>
[% IF ( patron.sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', patron.sort1) | html %]</li>[% END %]
[% IF ( patron.sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', patron.sort2) | html %]</li>[% END %]
- [% UNLESS ( patron.autorenew_checkouts ) %]<li>Auto renewal: Patron has opted out</li>[% END %]
+ [% UNLESS ( patron.autorenew_checkouts ) %]<li>Auto-renewal: Patron has opted out</li>[% END %]
</ol>
</div>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 8321edef92..9d1bbf8a2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -522,7 +522,7 @@
[% END %]
[% UNLESS ( patron.autorenew_checkouts ) %]
<li id="patron-autorenew_checkouts">
- <span class="label">Auto renewal:</span>
+ <span class="label">Auto-renewal:</span>
Patron has opted out
</li>
[% END %]
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 e101127ca2..3eaf7c16a3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -154,7 +154,7 @@
[% IF Koha.Preference('AllowPatronToControlAutorenewal') %]
<form id="autorenewal_option" action="/cgi-bin/koha/opac-user.pl" method="post">
<label for="yes-autorenew_checkouts">
- Allow auto renewal:
+ Allow auto-renewal:
</label>
[% IF ( borrower.autorenew_checkouts ) %]
<label class="radio inline" for="yes-autorenew_checkouts">
@@ -178,7 +178,7 @@
[% END %]
<input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
<input type="hidden" name="update_arc" value="1" />
- <input type="submit" value="Update auto renewal preference" />
+ <input type="submit" value="Update auto-renewal preference" />
</form>
[% END %]
--
2.11.0