@@ -, +, @@ --- .../atomicupdate/bug_24378_auto_renewals.perl | 4 +-- installer/data/mysql/updatedatabase.pl | 36 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_24378_auto_renewals.perl +++ a/installer/data/mysql/atomicupdate/bug_24378_auto_renewals.perl @@ -17,7 +17,7 @@ if( CheckVersion( $DBversion ) ) { }); $dbh->do(q{ UPDATE letter SET - content = REPLACE(content, "It\'s too late to renew this checkout.", "It\'s too late to renew this item.") + content = REPLACE(content, "It's too late to renew this checkout.", "It's too late to renew this item.") WHERE code = 'AUTO_RENEWALS'; }); $dbh->do(q{ @@ -27,7 +27,7 @@ if( CheckVersion( $DBversion ) ) { }); $dbh->do(q{ UPDATE letter SET - content = REPLACE(content, "The following item [% biblio.title %] has correctly been renewed and is now due [% checkout.date_due | $KohaDates as_due_date => 1 %]", "The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due %] + content = REPLACE(content, "The following item [% biblio.title %] has correctly been renewed and is now due [% checkout.date_due %]", "The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due as_due_date => 1 %] ") WHERE code = 'AUTO_RENEWALS'; }); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -14440,24 +14440,24 @@ if( CheckVersion( $DBversion ) ) { $dbh->do(q{ INSERT INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS', 'Notification of automatic renewal', 'Automatic renewal notice', "Dear [% borrower.firstname %] [% borrower.surname %], - [% IF checkout.auto_renew_error %] - The following item, [% biblio.title %], has not been renewed because: - [% IF checkout.auto_renew_error == 'too_many' %] - You have reached the maximum number of checkouts possible. - [% ELSIF checkout.auto_renew_error == 'on_reserve' %] - This item is on hold for another patron. - [% ELSIF checkout.auto_renew_error == 'restriction' %] - You are currently restricted. - [% ELSIF checkout.auto_renew_error == 'overdue' %] - You have overdue items. - [% ELSIF checkout.auto_renew_error == 'auto_too_late' %] - It\'s too late to renew this item. - [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %] - Your total unpaid fines are too high. - [% END %] - [% ELSE %] - The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %] - [% END %]", 'email'); +[% IF checkout.auto_renew_error %] +The following item, [% biblio.title %], has not been renewed because: +[% IF checkout.auto_renew_error == 'too_many' %] +You have reached the maximum number of checkouts possible. +[% ELSIF checkout.auto_renew_error == 'on_reserve' %] +This item is on hold for another patron. +[% ELSIF checkout.auto_renew_error == 'restriction' %] +You are currently restricted. +[% ELSIF checkout.auto_renew_error == 'overdue' %] +You have overdue items. +[% ELSIF checkout.auto_renew_error == 'auto_too_late' %] +It\'s too late to renew this item. +[% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %] +Your total unpaid fines are too high. +[% END %] +[% ELSE %] +The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %] +[% END %]", 'email'); }); SetVersion( $DBversion ); --