From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 2 Jul 2020 09:55:33 +0000 (+0200)
Subject: Fix formatting of text/plain notifications
X-Git-Tag: 5.2.8~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bddbb51de725c9e6485259f6badd65ffd00b3b7;p=GitHub%2FWoltLab%2FWCF.git

Fix formatting of text/plain notifications

see #325
---

diff --git a/com.woltlab.wcf/templates/email_notification_comment.tpl b/com.woltlab.wcf/templates/email_notification_comment.tpl
index 6dba9de9e5..595d7a2b1e 100644
--- a/com.woltlab.wcf/templates/email_notification_comment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_comment.tpl
@@ -1,7 +1,7 @@
 {assign var='count' value=$event->getAuthors()|count}{assign var='guestTimesTriggered' value=$event->getNotification()->guestTimesTriggered}{assign var='authors' value=$event->getAuthors()|array_values}
 {if $mimeType === 'text/plain'}
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
-{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
+{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered} {* this line ends with a space *}
 
 {@$event->getUserNotificationObject()->getMailText($mimeType)}{/if} {* this line ends with a space *}
 {else}
diff --git a/com.woltlab.wcf/templates/email_notification_commentResponse.tpl b/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
index 1d143d5dda..6f21f85bbe 100644
--- a/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
+++ b/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
@@ -1,7 +1,7 @@
 {assign var='count' value=$event->getAuthors()|count}{assign var='guestTimesTriggered' value=$event->getNotification()->guestTimesTriggered}{assign var='authors' value=$event->getAuthors()|array_values}
 {if $mimeType === 'text/plain'}
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
-{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
+{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered} {* this line ends with a space *}
 
 {$event->getUserNotificationObject()->message}{/if} {* this line ends with a space *}
 {else}
diff --git a/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl b/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
index 1d143d5dda..6f21f85bbe 100644
--- a/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
+++ b/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
@@ -1,7 +1,7 @@
 {assign var='count' value=$event->getAuthors()|count}{assign var='guestTimesTriggered' value=$event->getNotification()->guestTimesTriggered}{assign var='authors' value=$event->getAuthors()|array_values}
 {if $mimeType === 'text/plain'}
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
-{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
+{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered} {* this line ends with a space *}
 
 {$event->getUserNotificationObject()->message}{/if} {* this line ends with a space *}
 {else}
diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
index 62efef8d38..afcfff1e63 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
@@ -1,7 +1,7 @@
 {assign var='count' value=$event->getAuthors()|count}{assign var='guestTimesTriggered' value=$event->getNotification()->guestTimesTriggered}{assign var='authors' value=$event->getAuthors()|array_values}
 {if $mimeType === 'text/plain'}
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
-{lang}{$notificationContent[variables][languageItemPrefix]}.comment.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
+{lang}{$notificationContent[variables][languageItemPrefix]}.comment.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered} {* this line ends with a space *}
 
 {@$event->getUserNotificationObject()->getMailText($mimeType)}{/if} {* this line ends with a space *}
 {else}
diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
index 873c5f0f1b..7939599e26 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
@@ -1,7 +1,7 @@
 {assign var='count' value=$event->getAuthors()|count}{assign var='guestTimesTriggered' value=$event->getNotification()->guestTimesTriggered}{assign var='authors' value=$event->getAuthors()|array_values}
 {if $mimeType === 'text/plain'}
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
-{lang}{$notificationContent[variables][languageItemPrefix]}.commentResponse.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
+{lang}{$notificationContent[variables][languageItemPrefix]}.commentResponse.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered} {* this line ends with a space *}
 
 {@$event->getUserNotificationObject()->getMailText($mimeType)}{/if} {* this line ends with a space *}
 {else}