Attachment #126135 for bug #28084

View | Details | Raw Unified | Return to bug 28084
Collapse All | Expand All

Lines 246-252 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +1 lines)
246	var ALERT_ITEM_WITHDRAWN = _("Item has been withdrawn (transaction recorded anyway)");	246	var ALERT_ITEM_WITHDRAWN = _("Item has been withdrawn (transaction recorded anyway)");
247	var ALERT_ITEM_RESTRICTED = _("Item is restricted (transaction recorded anyway)");	247	var ALERT_ITEM_RESTRICTED = _("Item is restricted (transaction recorded anyway)");
248	var ALERT_ITEM_LOST = _("Item has been lost (transaction recorded anyway)");	248	var ALERT_ITEM_LOST = _("Item has been lost (transaction recorded anyway)");
249	var ALERT_NO_MATCHING_PATRON = _("No patron cardnumber in offline database (proceeding anyway): %s");	249	var ALERT_NO_MATCHING_PATRON = _("No patron card number in offline database (proceeding anyway): %s");
250	var ALERT_PATRON_GONE_NO_ADDRESS = _("Patron's address is in doubt (proceeding anyway)");	250	var ALERT_PATRON_GONE_NO_ADDRESS = _("Patron's address is in doubt (proceeding anyway)");
251	var ALERT_PATRON_CARD_LOST = _("Patron's card is lost");	251	var ALERT_PATRON_CARD_LOST = _("Patron's card is lost");
252	var ALERT_PATRON_EXPIRED = _("Patron's card is expired (%s)");	252	var ALERT_PATRON_EXPIRED = _("Patron's card is expired (%s)");

Lines 256-262 legend:hover { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-2 / +2 lines)
256	[% ELSE %]	256	[% ELSE %]
257	<input type="hidden" name="op" value="save" />	257	<input type="hidden" name="op" value="save" />
258	[% IF step == 4 \|\| step == 5 \|\| step == 6 \|\| step == 2 \|\| step == 1 \|\| step == 7 %]	258	[% IF step == 4 \|\| step == 5 \|\| step == 6 \|\| step == 2 \|\| step == 1 \|\| step == 7 %]
259	[%# Only put the cardnumber if we arent showing it in the form later %]	259	[%# Only put the card number if we arent showing it in the form later %]
260	[% IF cardnumber %]	260	[% IF cardnumber %]
261	<input type="hidden" name="cardnumber" value="[% cardnumber \| html %]" />	261	<input type="hidden" name="cardnumber" value="[% cardnumber \| html %]" />
262	[% END %]	262	[% END %]
Lines 889-895 legend:hover { Link Here
889	[% END %]	889	[% END %]
890	[% IF autoMemberNum %]	890	[% IF autoMemberNum %]
891	[% IF mandatorycardnumber %]	891	[% IF mandatorycardnumber %]
892	<br/><span class="error">AutoMemberNum is set to enabled, but cardnumber is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled.</span>	892	<br/><span class="error">AutoMemberNum is set to enabled, but card number is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled.</span>
893	[% ELSE %]	893	[% ELSE %]
894	<br/>Leave blank for auto calc during registration	894	<br/>Leave blank for auto calc during registration
895	[% END %]	895	[% END %]





                    [% IF e.invalid_cardnumber %]
                        <li class="line_error">
                            Card number [% e.cardnumber | html %] is not a valid card number
                            [% IF e.borrowernumber %] (for patron with borrowernumber [% e.borrowernumber | html %])[% END %]
                        </li>
                    [% END %]

[% ELSE %]
    <ul>
        <li>Select a file to import into the borrowers table</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">

            <ol>
                <li class="radio">
                    <select name="matchpoint" id="matchpoint">
                        <option value="cardnumber">Card number</option>
                        <option value="userid">Username</option>
                        [% FOREACH matchpoint IN matchpoints %]
                            <option value="[% matchpoint.code | html %]">[% matchpoint.description | html %]</option>

Lines 139-145 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt (-1 / +1 lines)
139	[% ELSE %]	139	[% ELSE %]
140	<li id="cardnum" style="display: none">	140	<li id="cardnum" style="display: none">
141	[% END %]	141	[% END %]
142	<label for="cardnumber">Enter patron cardnumber: </label>	142	<label for="cardnumber">Enter patron card number: </label>
143	<input type="text" id="cardnumber" name="cardnumber" value="[% cardnumber \| html %]" size="15" />	143	<input type="text" id="cardnumber" name="cardnumber" value="[% cardnumber \| html %]" size="15" />
144	<span class="required">Required</span>	144	<span class="required">Required</span>
145	</li>	145	</li>

Lines 43-49 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +1 lines)
43	[% IF ( lost ) %]	43	[% IF ( lost ) %]
44	<li id="lost">	44	<li id="lost">
45	Your library card has been marked as lost or stolen.<br />	45	Your library card has been marked as lost or stolen.<br />
46	<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>	46	<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>
47	</li>	47	</li>
48	[% END %]	48	[% END %]
49		49

Lines 89-96 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
89		89
90	[% IF ( borrower.warndeparture ) %]	90	[% IF ( borrower.warndeparture ) %]
91	<div class="alert alert-warning" id="warndeparture">	91	<div class="alert alert-warning" id="warndeparture">
92	<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>	92	<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>
93	[% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %]	93	[% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your library card expires.</span>[% END %]
94	</div>	94	</div>
95	[% END %]	95	[% END %]
96		96

Lines 84-90 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-2 / +1 lines)
84	[% ELSIF ( circ_error_DEBARRED ) %]	84	[% ELSIF ( circ_error_DEBARRED ) %]
85	<span id="ce_debarred">Your account has been suspended.</span>	85	<span id="ce_debarred">Your account has been suspended.</span>
86	[% ELSIF ( circ_error_CARD_LOST ) %]	86	[% ELSIF ( circ_error_CARD_LOST ) %]
87	<span id="ce_card_lost">This card has been declared lost.</span>	87	<span id="ce_card_lost">This library card has been declared lost.</span>
88	[% ELSIF ( circ_error_GNA ) %]	88	[% ELSIF ( circ_error_GNA ) %]
89	<span id="ce_gna">Your contact information seems to be incomplete.</span>	89	<span id="ce_gna">Your contact information seems to be incomplete.</span>
90	[% ELSIF ( circ_error_INVALID_DATE ) %]	90	[% ELSIF ( circ_error_INVALID_DATE ) %]
91	-

Return to bug 28084

Lines 135-141 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-3 / +3 lines)
135		135
136	[% IF e.invalid_cardnumber %]	136	[% IF e.invalid_cardnumber %]
137	<li class="line_error">	137	<li class="line_error">
138	Cardnumber [% e.cardnumber \| html %] is not a valid cardnumber	138	Card number [% e.cardnumber \| html %] is not a valid card number
139	[% IF e.borrowernumber %] (for patron with borrowernumber [% e.borrowernumber \| html %])[% END %]	139	[% IF e.borrowernumber %] (for patron with borrowernumber [% e.borrowernumber \| html %])[% END %]
140	</li>	140	</li>
141	[% END %]	141	[% END %]
Lines 203-209 Link Here
203	[% ELSE %]	203	[% ELSE %]
204	<ul>	204	<ul>
205	<li>Select a file to import into the borrowers table</li>	205	<li>Select a file to import into the borrowers table</li>
206	<li>If a cardnumber exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li>	206	<li>If a card number exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li>
207	</ul>	207	</ul>
208		208
209	<form method="post" action="[% SCRIPT_NAME \| html %]" enctype="multipart/form-data">	209	<form method="post" action="[% SCRIPT_NAME \| html %]" enctype="multipart/form-data">
Lines 229-235 Link Here
229	<ol>	229	<ol>
230	<li class="radio">	230	<li class="radio">
231	<select name="matchpoint" id="matchpoint">	231	<select name="matchpoint" id="matchpoint">
232	<option value="cardnumber">Cardnumber</option>	232	<option value="cardnumber">Card number</option>
233	<option value="userid">Username</option>	233	<option value="userid">Username</option>
234	[% FOREACH matchpoint IN matchpoints %]	234	[% FOREACH matchpoint IN matchpoints %]
235	<option value="[% matchpoint.code \| html %]">[% matchpoint.description \| html %]</option>	235	<option value="[% matchpoint.code \| html %]">[% matchpoint.description \| html %]</option>