From 8a85619a7f099e55f44ccd27d7d94f3d10a36b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 19 Jul 2018 15:34:32 +0200 Subject: [PATCH] emails: change rst paragraphs so manual newlines are considered (#25376) --- wcs/formdef.py | 3 +-- wcs/qommon/emails.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wcs/formdef.py b/wcs/formdef.py index 5cadf761..e2ca6391 100644 --- a/wcs/formdef.py +++ b/wcs/formdef.py @@ -1393,8 +1393,7 @@ EmailsDirectory.register('new_user', N_('Notification of creation to user'), Hello, [if-any user] -This mail is a reminder about the form you just submitted; you can consult it -with this link: [url] +This mail is a reminder about the form you just submitted; you can consult it with this link: [url] [else] This mail is a reminder about the form you just submitted. [end] diff --git a/wcs/qommon/emails.py b/wcs/qommon/emails.py index 508d270a..40e4a85e 100644 --- a/wcs/qommon/emails.py +++ b/wcs/qommon/emails.py @@ -159,6 +159,8 @@ def email(subject, mail_body, email_rcpt, replyto = None, bcc = None, 'report_level': 5}, config_section = None, enable_exit_status = None) + # change paragraphs so manual newlines are considered. + htmlmail = htmlmail.replace('

', '

') except: htmlmail = None -- 2.18.0