From 469ffe1a555466a4fa94b034eb167709695e07bf Mon Sep 17 00:00:00 2001 From: Koha Date: Mon, 6 Jun 2016 12:24:56 +0000 Subject: [PATCH] Bug 12509 - Untranslatable : Fix problem with Restriction added by overdues process --- koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc | 8 +++++++- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 7 ++++++- misc/cronjobs/overdue_notices.pl | 3 +-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index aea0889..3d2cc9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -51,7 +51,13 @@ Discharge [% END %] - [% d.comment %] + + [% IF d.comment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %] + [% ELSE %] + [% d.comment %] + [% END %] + [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] 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 b775673..4714e42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -187,7 +187,12 @@ function validate1(date) { [% END %] [% IF ( debarredcomment ) %] - with the explanation: [% debarredcomment | html_line_break %] + with the explanation: + [% IF debarredcomment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] + [% ELSE %] + [% debarredcomment | html_line_break %] + [% END %] [% END %] View restrictions diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 06fec8f..050882d 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -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"; -- 2.7.4