Bugzilla – Attachment 104704 Details for
Bug 24378
Change wording on AUTO_RENEWALS notice in updatedatabase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24378: (QA follow-up) fix minor issues
Bug-24378-QA-follow-up-fix-minor-issues.patch (text/plain), 4.29 KB, created by
Jonathan Druart
on 2020-05-11 13:45:25 UTC
(
hide
)
Description:
Bug 24378: (QA follow-up) fix minor issues
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-05-11 13:45:25 UTC
Size:
4.29 KB
patch
obsolete
>From 9bae2c630a6bed2fdf789ee43d92a7762376df16 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 11 May 2020 15:44:32 +0200 >Subject: [PATCH] Bug 24378: (QA follow-up) fix minor issues > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../atomicupdate/bug_24378_auto_renewals.perl | 4 +-- > installer/data/mysql/updatedatabase.pl | 36 +++++++++---------- > 2 files changed, 20 insertions(+), 20 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_24378_auto_renewals.perl b/installer/data/mysql/atomicupdate/bug_24378_auto_renewals.perl >index 6dd5c1d672..c8635a3270 100644 >--- a/installer/data/mysql/atomicupdate/bug_24378_auto_renewals.perl >+++ b/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'; > }); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 5333deb5fd..f9ad3f97a0 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/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 ); >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24378
:
100309
|
100416
|
100417
|
100479
|
100480
|
100485
|
102827
|
102828
|
102871
|
102872
|
104683
|
104701
|
104702
|
104703
| 104704