Bug 33058: Update "fines" to "charges" for viewing a guarantees charges

Charges includes fines and fees, while fines are mostly
negative. Changing this according to our terminology
guidelines.

To test:
* Make sure the patron category of your patron is set
  to be 'can be guarantee' in administration
* Set  AllowStaffToSetFinesVisibilityForGuarantor and
   AllowPatronToSetFinesVisibilityForGuarantor to allow
* Set OpacPrivacy to allow
* Edit your patron, give it a guarantor and
  look at the "Show fines to guarantors setting" and hint
* Save and look at the label of the field on the details tab
* Go to the OPAC and log in
* Check the Privavy tab for the option to allow the guarantee
  to see your charges
* Apply patch. Verify:
  * System preference descriptions changes
  * Option and label names have changed in all steps above

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 3e1900d..a187823 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -600,7 +600,7 @@ OPAC:
             - Only allow patrons to renew their own books on the OPAC if they have less than
             - pref: OPACFineNoRenewals
               class: currency
-            - '[% local_currency %] in fines (leave blank to disable).'
+            - '[% local_currency %] in charges (leave blank to disable).'
         -
             - pref: OPACFineNoRenewalsIncludeCredits
               choices:
@@ -686,7 +686,7 @@ OPAC:
               choices:
                   1: Allow
                   0: "Don't allow"
-            - "patrons to choose their own privacy settings for showing the patron's fines to the patron's guarantor."
+            - "patrons to choose their own privacy settings for showing the patron's charges to the patron's guarantor."
         -
             - Use borrowernumber
             - pref: AnonymousPatron

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 685a09b..b063819 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -348,7 +348,7 @@ Patrons:
            choices:
                1: Allow
                0: "Don't allow"
-         - staff to set the ability for a patron's fines to be viewed by linked patrons in the OPAC.
+         - staff to set the ability for a patron's charges to be viewed by linked patrons in the OPAC.
 
     Privacy:
      -

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 9dd015b..10a4a4d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -610,7 +610,7 @@ legend:hover {
                                                 [% END %]
                                                 [% IF Koha.Preference('AllowStaffToSetFinesVisibilityForGuarantor') %]
                                                     <li>
-                                                        <label for="privacy_guarantor_fines">Show fines to guarantors</label>
+                                                        <label for="privacy_guarantor_fines">Show charges to guarantors</label>
                                                         <select name="privacy_guarantor_fines" id="privacy_guarantor_fines">
                                                             [% IF borrower_data.privacy_guarantor_fines %]
                                                                 <option value="0">No</option>
@@ -620,7 +620,7 @@ legend:hover {
                                                                 <option value="1">Yes</option>
                                                             [% END %]
                                                         </select>
-                                                        <div class="hint">Allow guarantors of this patron to view this patron's fines from the OPAC</div>
+                                                        <div class="hint">Allow guarantors of this patron to view this patron's charges from the OPAC</div>
                                                     </li>
                                                 [% END %]
                                             </ol>

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 0cb639a..9cadcd5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -200,7 +200,7 @@
                                         </li>
 
                                         <li id="patron-privacy_guarantor_fines">
-                                            <span class="label">Show fines to guarantor</span>
+                                            <span class="label">Show charges to guarantor</span>
                                             [% IF patron.privacy_guarantor_fines %]
                                                 Yes
                                             [% ELSE %]

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index 1ca4b28..1d3c155 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -121,7 +121,7 @@
                                     [% IF Koha.Preference('AllowPatronToSetFinesVisibilityForGuarantor') %]
                                         <div class="form-group row">
                                             <div class="col-6">
-                                                <label for="privacy_guarantor_fines">Allow your guarantor to view your current fines?</label>
+                                                <label for="privacy_guarantor_fines">Allow your guarantor to view your current charges?</label>
                                                 <select class="form-control" name="privacy_guarantor_fines">
                                                     [% IF borrower.privacy_guarantor_fines %]
                                                         <option value="0">No</option>