From 904f8a84cdf0706b6d11620309bb72aaef8636fe Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 4 Nov 2022 15:14:14 +0000 Subject: [PATCH] Bug 31028: (follow-up) Add
to notices This should resolve the lack of linebreaks in resulting emails Signed-off-by: David Nind Signed-off-by: Helen Oliver Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- .../data/mysql/atomicupdate/bug_31028.pl | 8 +-- .../mysql/en/mandatory/sample_notices.yml | 52 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_31028.pl b/installer/data/mysql/atomicupdate/bug_31028.pl index 37599d24e8..612ac39e08 100644 --- 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 %],\r\n\r\nThankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].\r\n\r\nYou reported: \r\n[% ticket.body %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],

Thankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].

You reported:
[% ticket.body %]

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 %],\r\n\r\nThe library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],

The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].

The following comment was left:
[% ticket_update.message %]

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 %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],

The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.

The following comment was left:
[% ticket_update.message %]

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,\r\n\r\n[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]\r\n\r\n\r\n\r\n[% ticket.body %]\r\n\r\n\r\n\r\nYou can mark this concern as resolved from the concern management page.", 'email' ); + VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "Dear cataloger,

[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]

[% ticket.body %]

You can mark this concern as resolved from the concern management page.", '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 21668a7c9a..cf98329740 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -52,13 +52,13 @@ tables: message_transport_type: email lang: default content: - - "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %]," - - "" - - "Thankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %]." - - "" - - "You reported: " - - "[% ticket.body %]" - - "" + - "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],
" + - "
" + - "Thankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].
" + - "
" + - "You reported:
" + - "[% ticket.body %]
" + - "
" - "Thankyou" - module: catalogue @@ -70,13 +70,13 @@ tables: message_transport_type: email lang: default content: - - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %]," - - "" - - "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved." - - "" - - "The following comment was left: " - - "[% ticket_update.message %]" - - "" + - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],
" + - "
" + - "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.
" + - "
" + - "The following comment was left:
" + - "[% ticket_update.message %]
" + - "
" - "Thankyou" - module: catalogue @@ -88,13 +88,13 @@ tables: message_transport_type: email lang: default content: - - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %]," - - "" - - "The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %]." - - "" - - "The following comment was left: " - - "[% ticket_update.message %]" - - "" + - "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],
" + - "
" + - "The library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].
" + - "
" + - "The following comment was left:
" + - "[% ticket_update.message %]
" + - "
" - "Thankyou" - module: catalogue @@ -106,11 +106,11 @@ tables: message_transport_type: email lang: default content: - - "Dear cataloger," - - "[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]" - - "" - - "[% ticket.body %]" - - "" + - "Dear cataloger,
" + - "[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]
" + - "
" + - "[% ticket.body %]
" + - "
" - "You can mark this concern as resolved from the concern management page." - module: circulation -- 2.39.5