Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 12509 - Fix Untranslatable Restriction added by overdues process 

Changes the value of the "comment" column in "borrower_debarments" table
from "Restriction added by overdues process yyyy-mm-dd hh:mm:ss" to
"OVERDUE_PROCESS yyyy-mm-dd hh:mm:ss" in the overdue_notices.pl. Then in
the templates "moremember.tt", "circulation.tt", "memberentrygen.tt",
"opac-reserve.tt" and "opac-user.tt" the value of "comment" is
check, if it's an automatical comment due to overdue process it'll
write "Restriction added by overdues process yyyy-mm-dd hh:mm:ss",
then if there is a customizable comment it will be written without
modification. Like this, the comment "Restriction added by overdues
process" is written in the po files and can be translated later.

To test:
1) create a patron with automatical restriction due to overdue process;
2) apply patch;
3) run misc/cronjobs/overdue_notices.pl;
4) verify if the comment "Restriction added by overdues process" is well
   written and translatable on the following page :
    - opac patron home page (opac-user.tt);
    - opac item reservation page (opac-reserve.tt);
    - pro patron page (moremember.tt);
    - reservation item for a patron (circulation.tt, memberentrygen.tt);
5) try to translate the comment in po files;
6) sign off.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
16.11.x
Morgane Alonso 8 years ago
committed by Kyle M Hall
parent
6398d1b242
commit
a1285ba9c0
7 changed files with 46 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
  2. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
  3. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
  4. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
  5. 10
      koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
  6. 11
      koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
  7. 3
      misc/cronjobs/overdue_notices.pl

8
koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
View File

@ -56,7 +56,13 @@
Discharge
[% END %]
</td>
<td>[% d.comment %]</td>
<td>
[% IF d.comment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
[% ELSE %]
[% d.comment %]
[% END %]
</td>
<td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
[% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
<td>

7
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View File

@ -747,7 +747,12 @@ No patron matched <span class="ex">[% message %]</span>
[% END %]
[% IF ( debarredcomment ) %]
with the explanation: <br/><i>[% debarredcomment | html_line_break %]</i>
with the explanation: <br/><i>
[% IF debarredcomment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
[% ELSE %]
[% debarredcomment | html_line_break %]
[% END %]
[% END %]
<br/>

8
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
View File

@ -946,7 +946,13 @@ $(document).ready(function() {
[% FOREACH d IN debarments %]
<tr>
<td>[% d.type %]</td>
<td>[% d.comment %]</td>
<td>
[% IF d.comment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
[% ELSE %]
[% d.comment %]
[% END %]
</td>
<td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
[% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
<td>

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View File

@ -189,7 +189,12 @@ function validate1(date) {
[% END %]
[% IF ( debarredcomment ) %]
with the explanation: <i>[% debarredcomment | html_line_break %]</i>
with the explanation: <i>
[% IF debarredcomment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
[% ELSE %]
[% debarredcomment | html_line_break %]
[% END %]
[% END %]
<a href="#reldebarments" id="view_restrictions">View restrictions</a>
</li>

10
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View File

@ -41,7 +41,15 @@
[% IF ( debarred ) %]
<li id="debarred">
Your account has been frozen.
[% IF debarred_comment %] Comment: <span id="userdebarred_comment">"[% debarred_comment %]"</span>[% END %]
[% IF debarred_comment %] Comment: <span id="userdebarred_comment">"
[% IF debarred_comment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %]
[% ELSE %]
[% debarred_comment | html_line_break %]
[% END %]
</span>
[% END %]
[% IF debarred_date && debarred_date != '9999-12-31' %] End date: <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>[% END %]
<br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a>
</li>

11
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -91,7 +91,16 @@
<div class="alert">
<ul>
[% IF ( userdebarred ) %]
<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li>
<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
[% IF ( BORROWER_INFO.debarredcomment ) %] with the comment
<span id="userdebarred_comment">
[% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %]
"Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') %]"
[% ELSE %]
[% BORROWER_INFO.debarredcomment %]
[% END %]
</span>
[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li>
[% END %]
[% IF ( BORROWER_INFO.gonenoaddress ) %]
<li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file. Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>

3
misc/cronjobs/overdue_notices.pl
View File

@ -598,8 +598,7 @@ END_SQL
{
borrowernumber => $borrowernumber,
type => 'OVERDUES',
comment => "Restriction added by overdues process "
. output_pref( dt_from_string() ),
comment => "OVERDUES_PROCESS " . output_pref( dt_from_string() ),
}
);
$verbose and warn "debarring $borr\n";

Write Preview
Loading…
Cancel
Save