Simplify phrases for notifications

See WoltLab/WCF#3958

diff --git a/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php b/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
index eac7e7de11678022a6430ad782c35317d6635e7f..c753a8e7d65f99e9caf6a2ddb1c1726ea10ecc5f 100644 (file)
--- a/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
+++ b/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
@@ -103,6 +103,7 @@ class ConversationMessageUserNotificationEvent extends AbstractUserNotificationE
         return $this->getLanguage()->getDynamicVariable('wcf.user.notification.conversation.message.mail.title', [
             'author' => $this->author,
             'message' => $this->userNotificationObject,
+            'conversation' => $this->userNotificationObject->getConversation(),
         ]);
     }
 

diff --git a/language/de.xml b/language/de.xml
index 415a255cd3bdbabbf6074645c1aa3f3998d9b9c5..5383a3be28c4d2afaf903cd46b92aa26ab1837fc 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -199,7 +199,7 @@
                <item name="wcf.user.notification.conversation.message.title.stacked"><![CDATA[{#$count} Teilnehmer haben auf eine Konversation geantwortet]]></item>
                <item name="wcf.user.notification.conversation.message.mail.plaintext"><![CDATA[{@$authorList} {if $count == 1 && !$guestTimesTriggered}hat{else}haben{/if} auf die Konversation „{@$conversation->getTitle()}“ [URL:{@$message->getLink()}] geantwortet{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
                <item name="wcf.user.notification.conversation.message.mail.html"><![CDATA[<p>{@$authorList} {if $count == 1 && !$guestTimesTriggered}hat{else}haben{/if} auf die Konversation <a href="{$message->getLink()}">{$conversation->getTitle()}</a> geantwortet:</p>]]></item>
-               <item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author->username}" hat auf die Konversation "{$message->getConversation()->subject}" geantwortet]]></item>
+               <item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author}" hat auf die Konversation "{@$conversation->getTitle()}" geantwortet]]></item>
                <item name="wcf.user.notification.conversation.message"><![CDATA[<strong>{$author}</strong> hat die Konversation <strong>{$conversation->getTitle()}</strong> gestartet.]]></item>
                <item name="wcf.user.notification.conversation.title"><![CDATA[Neue Konversation]]></item>
                <item name="wcf.user.notification.conversation.mail.plaintext"><![CDATA[{@$author} hat die Konversation „{@$conversation->getTitle()}“ [URL:{@$conversation->getLink()}] gestartet:]]></item>

diff --git a/language/en.xml b/language/en.xml
index b6438bb3e4f1f384c8e92eb6098a8a0621392bec..d774dfce330a95fbce8e3c8ac87c0cb8db199452 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -199,7 +199,7 @@
                <item name="wcf.user.notification.conversation.message.title.stacked"><![CDATA[{#$count} participants replied to a conversation]]></item>
                <item name="wcf.user.notification.conversation.message.mail.plaintext"><![CDATA[{@$authorList} replied to the conversation “{@$conversation->getTitle()}” [URL:{@$message->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
                <item name="wcf.user.notification.conversation.message.mail.html"><![CDATA[<p>{@$authorList} replied to the conversation <a href="{$message->getLink()}">{$conversation->getTitle()}</a>:</p>]]></item>
-               <item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author->username}" replied to the conversation "{$message->getConversation()->subject}"]]></item>
+               <item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author}" replied to the conversation "{@$conversation->getTitle()}"]]></item>
                <item name="wcf.user.notification.conversation.message"><![CDATA[<strong>{$author}</strong> started the conversation <strong>{$conversation->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.conversation.title"><![CDATA[New Conversation]]></item>
                <item name="wcf.user.notification.conversation.mail.plaintext"><![CDATA[{@$author} started the conversation “{@$conversation->getTitle()}” [URL:{@$conversation->getLink()}]:]]></item>