From d8756572545115e34313a1773cffde9e8d8f19c3 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 18 Feb 2021 11:37:29 +0100
Subject: [PATCH] Simplify phrases for notifications

See WoltLab/WCF#3958
---
 .../event/ConversationMessageUserNotificationEvent.class.php    | 1 +
 language/de.xml                                                 | 2 +-
 language/en.xml                                                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php b/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
index eac7e7d..c753a8e 100644
--- 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 415a255..5383a3b 100644
--- 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 b6438bb..d774dfc 100644
--- 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>
-- 
2.20.1