From 5c03351183348fdc08ed086ed5f83584185ac67f Mon Sep 17 00:00:00 2001
From: Matthias Schmidt
Date: Sun, 24 May 2020 12:38:36 +0200
Subject: [PATCH] Unify notification-related language items
See WoltLab/WCF#3324
See WoltLab/WCF#3326
---
language/de.xml | 6 +++---
language/en.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/language/de.xml b/language/de.xml
index fe3abf7..4b39dfc 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -190,14 +190,14 @@
- - getAnchorTag()} hat auf die Konversation {$message->getConversation()->getTitle()} geantwortet.]]>
- - 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 {$message->getConversation()->getTitle()} geantwortet.]]>
+ - {$author} hat auf die Konversation {$message->getConversation()->getTitle()} geantwortet.]]>
+ - {$message->getConversation()->getTitle()} geantwortet.]]>
- getUserNotificationObject()->getConversation()->subject}â [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}] geantwortet{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && !$guestTimesTriggered}hat{else}haben{/if} auf die Konversation {$event->getUserNotificationObject()->getConversation()->subject} geantwortet:
]]>
- username}" hat auf die Konversation "{$message->getConversation()->subject}" geantwortet]]>
- - getAnchorTag()} hat die Konversation {$conversation->subject} gestartet.]]>
+ - {$author} hat die Konversation {$conversation->getTitle()} gestartet.]]>
- 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:]]>
- {$event->getAuthor()->username} hat die Konversation {$event->getUserNotificationObject()->subject} gestartet:]]>
diff --git a/language/en.xml b/language/en.xml
index 209ba2d..a244a40 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -190,14 +190,14 @@
- - getAnchorTag()} replied to the conversation {$message->getConversation()->getTitle()}.]]>
- - 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 {$message->getConversation()->getTitle()}.]]>
+ - {$author} replied to the conversation {$message->getConversation()->getTitle()}.]]>
+ - {$message->getConversation()->getTitle()}.]]>
- getUserNotificationObject()->getConversation()->subject}â [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to the conversation {$event->getUserNotificationObject()->getConversation()->subject}:]]>
- username}" replied to the conversation "{$message->getConversation()->subject}"]]>
- - getAnchorTag()} started the conversation {$conversation->subject}.]]>
+ - {$author} started the conversation {$conversation->getTitle()}.]]>
- 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}]:]]>
- {$event->getAuthor()->username} started the conversation {$event->getUserNotificationObject()->subject}:]]>
--
2.20.1