Unify notification-related language items

See WoltLab/WCF#3324
See WoltLab/WCF#3326

diff --git a/language/de.xml b/language/de.xml
index fe3abf7bb219e1e5f2ab9c1bb2d4edb999d7ca42..4b39dfc20c819c975d2b2db5c3f442c133d4f414 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -190,14 +190,14 @@
                <item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Konversation]]></item>
        </category>
        <category name="wcf.user.notification">
-               <item name="wcf.user.notification.conversation.message.message"><![CDATA[{@$author->getAnchorTag()} hat auf die Konversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a> geantwortet.]]></item>
-               <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$count} weitere Benutzer{/if} haben auf die Konversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a> geantwortet.]]></item>
+               <item name="wcf.user.notification.conversation.message.message"><![CDATA[<strong>{$author}</strong> hat auf die Konversation <strong>{$message->getConversation()->getTitle()}</strong> geantwortet.]]></item>
+               <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} haben auf die Konversation <strong>{$message->getConversation()->getTitle()}</strong> geantwortet.]]></item>
                <item name="wcf.user.notification.conversation.message.title"><![CDATA[Neue Antwort auf Konversation]]></item>
                <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 „{@$event->getUserNotificationObject()->getConversation()->subject}“ [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}] 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="{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isHtmlEmail=true}{/link}">{$event->getUserNotificationObject()->getConversation()->subject}</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"><![CDATA[{@$author->getAnchorTag()} hat die Konversation <a href="{link controller='Conversation' object=$conversation}{/link}">{$conversation->subject}</a> gestartet.]]></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[{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}] hat die Konversation „{@$event->getUserNotificationObject()->subject}“ [URL:{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}] gestartet:]]></item>
                <item name="wcf.user.notification.conversation.mail.html"><![CDATA[<p><a href="{link controller='User' object=$event->getAuthor() isHtmlEmail=true}{/link}">{$event->getAuthor()->username}</a> hat die Konversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject() isHtmlEmail=true}{/link}">{$event->getUserNotificationObject()->subject}</a> gestartet:</p>]]></item>

diff --git a/language/en.xml b/language/en.xml
index 209ba2d9b770500d6e96fe01606ae3f25a6b841c..a244a4086ae6734bee8236444309ee9c90397e9a 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -190,14 +190,14 @@
                <item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Conversation]]></item>
        </category>
        <category name="wcf.user.notification">
-               <item name="wcf.user.notification.conversation.message.message"><![CDATA[{@$author->getAnchorTag()} replied to the conversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a>.]]></item>
-               <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$count} other users{/if} replied to the conversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a>.]]></item>
+               <item name="wcf.user.notification.conversation.message.message"><![CDATA[<strong>{$author}</strong> replied to the conversation <strong>{$message->getConversation()->getTitle()}</strong>.]]></item>
+               <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} replied to the conversation <strong>{$message->getConversation()->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.conversation.message.title"><![CDATA[New Reply to a Conversation]]></item>
                <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 “{@$event->getUserNotificationObject()->getConversation()->subject}” [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}]{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="{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isHtmlEmail=true}{/link}">{$event->getUserNotificationObject()->getConversation()->subject}</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"><![CDATA[{@$author->getAnchorTag()} started the conversation <a href="{link controller='Conversation' object=$conversation}{/link}">{$conversation->subject}</a>.]]></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[{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}] started the conversation “{@$event->getUserNotificationObject()->subject}” [URL:{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}]:]]></item>
                <item name="wcf.user.notification.conversation.mail.html"><![CDATA[<p><a href="{link controller='User' object=$event->getAuthor() isHtmlEmail=true}{/link}">{$event->getAuthor()->username}</a> started the conversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject() isHtmlEmail=true}{/link}">{$event->getUserNotificationObject()->subject}</a>:</p>]]></item>