From 015abe4ffea0b901bf2f8d876b07a5ea80fa24e7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Oct 2021 16:12:29 +0000 Subject: [PATCH] Bug 28084: Standardize: Cardnumber, Card number, Card This patch modifies templates so that instances of "cardnumber" are replaced with "card number." Some instances where the word "card" is used by itself have been updated to "library card" to add some context. To test, apply the patch and view the following pages: - Circulation -> Built-in offline circulation interface -> Submit the "Check out" form without entering number. Check the alert message which appears. - Go to Administration -> System preferences and enable the AutoMemberNum system preference and use the BorrowerMandatoryField preference to make card number mandatory. - Go to Patrons -> New patron. The hint under the "Card number" field should refer to "card number" instead of "cardnumber." - Go to Tools -> Import patrons. - Under the page heading, the note should read "If a card number exists..." - Under "Field to use for record matching" you should see a "Card number" option in the menu. - If you try to import a CSV with an invalid card number you'll see an error message, "Card number X is not a valid card number." - Under Tools -> Upload patron images, check the "image file" radio button. The card number field label should read "Enter patron card number." - Log in to the OPAC as a patron whose card has been marked lost. Try to place a hold. You should see a message containing "please take your library card to the circulation desk" - On the "your summary" page you should see a message, "Your library card has been marked as lost or stolen." - Try to check out an item to this patron in the self-checkout system. You should be shown a message, "This library card has been declared lost." --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/picture-upload.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index 2a7c3fe174..90f85425bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -246,7 +246,7 @@ var ALERT_ITEM_WITHDRAWN = _("Item has been withdrawn (transaction recorded anyway)"); var ALERT_ITEM_RESTRICTED = _("Item is restricted (transaction recorded anyway)"); var ALERT_ITEM_LOST = _("Item has been lost (transaction recorded anyway)"); - var ALERT_NO_MATCHING_PATRON = _("No patron cardnumber in offline database (proceeding anyway): %s"); + var ALERT_NO_MATCHING_PATRON = _("No patron card number in offline database (proceeding anyway): %s"); var ALERT_PATRON_GONE_NO_ADDRESS = _("Patron's address is in doubt (proceeding anyway)"); var ALERT_PATRON_CARD_LOST = _("Patron's card is lost"); var ALERT_PATRON_EXPIRED = _("Patron's card is expired (%s)"); 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 451ffaeee5..4143f51ff0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -256,7 +256,7 @@ legend:hover { [% ELSE %] [% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %] - [%# Only put the cardnumber if we arent showing it in the form later %] + [%# Only put the card number if we arent showing it in the form later %] [% IF cardnumber %] [% END %] @@ -889,7 +889,7 @@ legend:hover { [% END %] [% IF autoMemberNum %] [% IF mandatorycardnumber %] -
AutoMemberNum is set to enabled, but cardnumber is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled. +
AutoMemberNum is set to enabled, but card number is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled. [% ELSE %]
Leave blank for auto calc during registration [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 080762d8d0..a0bb8409b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -135,7 +135,7 @@ [% IF e.invalid_cardnumber %]
  • - Cardnumber [% e.cardnumber | html %] is not a valid cardnumber + Card number [% e.cardnumber | html %] is not a valid card number [% IF e.borrowernumber %] (for patron with borrowernumber [% e.borrowernumber | html %])[% END %]
  • [% END %] @@ -203,7 +203,7 @@ [% ELSE %]
    @@ -229,7 +229,7 @@
    1. Required
    2. diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 8c57b2bddd..a041453937 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -43,7 +43,7 @@ [% IF ( lost ) %]
    3. Your library card has been marked as lost or stolen.
      - If this is an error, please take your card to the circulation desk at your local library and the error will be corrected. + If this is an error, please take your library card to the circulation desk at your local library and the error will be corrected.
    4. [% 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 3c6bb1206d..5f0586c002 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -89,8 +89,8 @@ [% IF ( borrower.warndeparture ) %]
      - Please note: Your card will expire on [% borrower.warndeparture | $KohaDates %]. Please contact the library for more information. - [% IF ( borrower.returnbeforeexpiry ) %] Also note that you must return all checked out items before your card expires.[% END %] + Please note: Your library card will expire on [% borrower.warndeparture | $KohaDates %]. Please contact the library for more information. + [% IF ( borrower.returnbeforeexpiry ) %] Also note that you must return all checked out items before your library card expires.[% END %]
      [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 2e5d352e43..bddfa7e919 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -84,7 +84,7 @@ [% ELSIF ( circ_error_DEBARRED ) %] Your account has been suspended. [% ELSIF ( circ_error_CARD_LOST ) %] - This card has been declared lost. + This library card has been declared lost. [% ELSIF ( circ_error_GNA ) %] Your contact information seems to be incomplete. [% ELSIF ( circ_error_INVALID_DATE ) %] -- 2.20.1