Bugzilla – Attachment 126135 Details for
Bug 28084
Standardize: Cardnumber, Card number, Card
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28084: Standardize: Cardnumber, Card number, Card
Bug-28084-Standardize-Cardnumber-Card-number-Card.patch (text/plain), 11.26 KB, created by
David Nind
on 2021-10-12 23:27:18 UTC
(
hide
)
Description:
Bug 28084: Standardize: Cardnumber, Card number, Card
Filename:
MIME Type:
Creator:
David Nind
Created:
2021-10-12 23:27:18 UTC
Size:
11.26 KB
patch
obsolete
>From 7b319bdd4d060635a4981f94ea81e8f4b24a0210 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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." > >Signed-off-by: David Nind <david@davidnind.com> >--- > 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 %] > <input type="hidden" name="op" value="save" /> > [% 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 %] > <input type="hidden" name="cardnumber" value="[% cardnumber | html %]" /> > [% END %] >@@ -889,7 +889,7 @@ legend:hover { > [% END %] > [% IF autoMemberNum %] > [% IF mandatorycardnumber %] >- <br/><span class="error">AutoMemberNum is set to enabled, but cardnumber is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled.</span> >+ <br/><span class="error">AutoMemberNum is set to enabled, but card number is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled.</span> > [% ELSE %] > <br/>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 %] > <li class="line_error"> >- 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 %] > </li> > [% END %] >@@ -203,7 +203,7 @@ > [% ELSE %] > <ul> > <li>Select a file to import into the borrowers table</li> >- <li>If a cardnumber exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li> >+ <li>If a card number exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li> > </ul> > > <form method="post" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data"> >@@ -229,7 +229,7 @@ > <ol> > <li class="radio"> > <select name="matchpoint" id="matchpoint"> >- <option value="cardnumber">Cardnumber</option> >+ <option value="cardnumber">Card number</option> > <option value="userid">Username</option> > [% FOREACH matchpoint IN matchpoints %] > <option value="[% matchpoint.code | html %]">[% matchpoint.description | html %]</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index cd50e6e684..cad90f6c0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -139,7 +139,7 @@ > [% ELSE %] > <li id="cardnum" style="display: none"> > [% END %] >- <label for="cardnumber">Enter patron cardnumber: </label> >+ <label for="cardnumber">Enter patron card number: </label> > <input type="text" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" size="15" /> > <span class="required">Required</span> > </li> >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 ) %] > <li id="lost"> > Your library card has been marked as lost or stolen.<br /> >- <em>If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</em> >+ <em>If this is an error, please take your library card to the circulation desk at your local library and the error will be corrected.</em> > </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 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 ) %] > <div class="alert alert-warning" id="warndeparture"> >- <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% borrower.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span> >- [% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %] >+ <strong>Please note:</strong><span> Your library card will expire on <span id="warndeparture_date">[% borrower.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span> >+ [% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your library card expires.</span>[% END %] > </div> > [% 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 ) %] > <span id="ce_debarred">Your account has been suspended.</span> > [% ELSIF ( circ_error_CARD_LOST ) %] >- <span id="ce_card_lost">This card has been declared lost.</span> >+ <span id="ce_card_lost">This library card has been declared lost.</span> > [% ELSIF ( circ_error_GNA ) %] > <span id="ce_gna">Your contact information seems to be incomplete.</span> > [% ELSIF ( circ_error_INVALID_DATE ) %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28084
:
126048
|
126135
|
126553