From eba7a32df59093b02a5f707b06f636a85be465f7 Mon Sep 17 00:00:00 2001 From: Andrew Fuerste-Henry Date: Wed, 11 Mar 2020 00:15:58 +0000 Subject: [PATCH] Bug 24378: Change wording of auto_renewals notice in updatedatabase On the template of AUTO-RENEWALS the wording is grammatically incorrect: [% IF checkout.auto_renew_error == 'too_many' %] You have reach the maximum of checkouts possible. This should say [% IF checkout.auto_renew_error == 'too_many' %] You have reached the maximum of checkouts possible. Test plan: - Make sure you have the AUTO_RENEWALS notice with the problematic spelling - install patch - update database - confirm changes to notice name and wording Signed-off-by: Katrin Fischer Kept Andrew's change on the original updatedatabase entry, but removed the database update to be done a little differently in a follow-up patch. Amended test plan. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- installer/data/mysql/updatedatabase.pl | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d751465be5..d31355c910 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14438,26 +14438,26 @@ if( CheckVersion( $DBversion ) ) { } $dbh->do(q{ - INSERT INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS', 'notification on auto renewing', 'Auto renewals', -"Dear [% borrower.firstname %] [% borrower.surname %], -[% IF checkout.auto_renew_error %] -The following item [% biblio.title %] has not been correctly renewed -[% IF checkout.auto_renew_error == 'too_many' %] -You have reach the maximum 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 overdues. -[% ELSIF checkout.auto_renew_error == 'auto_too_late' %] -It\'s too late to renew this checkout. -[% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %] -You have too much unpaid fines. -[% END %] -[% ELSE %] -The following item [% biblio.title %] has correctly been renewed and is now due [% checkout.date_due %] -[% END %]", 'email'); + 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 %] + [% END %]", 'email'); }); SetVersion( $DBversion ); -- 2.39.5