Bug 31028: (follow-up) Fix notices whitespace

We we're using [% %] rather than [%- -%] in our the notice template
introduced with this patchset.  This leads to some interesting rendering
results in some email clients.  Using the proper whitespace ignoring
template markup fixes the situation.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Helen Oliver <HOliver@tavi-port.ac.uk>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/installer/data/mysql/atomicupdate/bug_31028.pl b/installer/data/mysql/atomicupdate/bug_31028.pl
index 612ac39..efb46cf 100644 (file)
--- a/installer/data/mysql/atomicupdate/bug_31028.pl
+++ b/installer/data/mysql/atomicupdate/bug_31028.pl
@@ -89,7 +89,7 @@ return {
         $dbh->do(
             q{
                 INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
-                VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],<br><br>Thankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].<br><br>You reported: <br>[% ticket.body %]<br><br>Thankyou", 'email' );
+                VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thankyou", 'email' );
             }
         );
         say $out "Added new notice 'TICKET_ACKNOWLEDGE'";
@@ -97,7 +97,7 @@ return {
         $dbh->do(
             q{
                 INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
-                VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],<br><br>The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].<br><br>The following comment was left: <br>[% ticket_update.message %]<br><br>Thankyou", 'email' );
+                VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );
             }
         );
         say $out "Added new notice 'TICKET_UPDATE'";
@@ -105,7 +105,7 @@ return {
         $dbh->do(
             q{
                 INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
-                VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],<br><br>The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.<br><br>The following comment was left:   <br>[% ticket_update.message %]<br><br>Thankyou", 'email' );
+                VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left:   <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );
             }
         );
         say $out "Added new notice 'TICKET_RESOLVE'";
@@ -121,7 +121,7 @@ return {
         $dbh->do(
             q{
                 INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
-                VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "Dear cataloger,<br><br>[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]<br><br>[% ticket.body %]<br><br>You can mark this concern as resolved from the concern management <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", 'email' );
+                VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "[%- USE Koha -%]\r\nDear cataloger,<br><br>[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br><br>[%- ticket.body -%]<br><br>You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('IntranetBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", 'email' );
             }
         );
         say $out "Added new notice 'TICKET_NOTIFY'";

diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index cf98329..7760c91 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -52,12 +52,12 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],<br>"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>"
             - "<br>"
-            - "Thankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].<br>"
+            - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>"
             - "<br>"
             - "You reported: <br>"
-            - "[% ticket.body %]<br>"
+            - "[%- ticket.body -%]<br>"
             - "<br>"
             - "Thankyou"
 
@@ -70,12 +70,12 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],<br>"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
             - "<br>"
-            - "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.<br>"
+            - "The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%] as resolved.<br>"
             - "<br>"
             - "The following comment was left: <br>"
-            - "[% ticket_update.message %]<br>"
+            - "[%- ticket_update.message -%]<br>"
             - "<br>"
             - "Thankyou"
 
@@ -88,12 +88,12 @@ tables:
           message_transport_type: email
           lang: default
           content:
-            - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],<br>"
+            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
             - "<br>"
-            - "The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].<br>"
+            - "The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br>"
             - "<br>"
             - "The following comment was left: <br>"
-            - "[% ticket_update.message %]<br>"
+            - "[%- ticket_update.message -%]<br>"
             - "<br>"
             - "Thankyou"
 
@@ -106,12 +106,13 @@ tables:
           message_transport_type: email
           lang: default
           content:
+            - "[%- USE Koha -%]"
             - "Dear cataloger,<br>"
-            - "[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]<br>"
+            - "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br>"
             - "<br>"
-            - "[% ticket.body %]<br>"
+            - "[%- ticket.body -%]<br>"
             - "<br>"
-            - "You can mark this concern as resolved from the concern management <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
+            - "You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('IntranetBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
 
         - module: circulation
           code: ACCOUNT_CREDIT