From b0ab502bdb0d2d80a75fff6304da2f652ee7c60c Mon Sep 17 00:00:00 2001
From: Matthias Schmidt
Date: Sat, 23 May 2020 16:36:01 +0200
Subject: [PATCH] Remove links in user notifications messages (#3328)
* Remove links in user notifications messages
See #3326
* Remove unnecessary conditions
* Remove additional links in user notifications messages
---
.../files/lib/data/trophy/Trophy.class.php | 10 +++
wcfsetup/install/lang/de.xml | 88 +++++++++----------
wcfsetup/install/lang/en.xml | 88 +++++++++----------
3 files changed, 98 insertions(+), 88 deletions(-)
diff --git a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
index 645a205d9a..4693831615 100644
--- a/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
+++ b/wcfsetup/install/files/lib/data/trophy/Trophy.class.php
@@ -54,6 +54,16 @@ class Trophy extends DatabaseObject implements ITitledLinkObject, IRouteControll
*/
const DEFAULT_SIZE = 32;
+ /**
+ * Returns the title of the trophy.
+ *
+ * @return string
+ * @since 5.3
+ */
+ public function __toString() {
+ return $this->getTitle();
+ }
+
/**
* @inheritDoc
*/
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c696031d5d..e4966edbaf 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3252,8 +3252,8 @@ Benutzerkontos nun in vollem Umfang nutzen.]]>
- - getAnchorTag()} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Artikel {$article->getTitle()} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere{/if} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Artikel {$article->getTitle()} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Artikel {$article->getTitle()} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$article->getTitle()} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- filesize|filesize}, {#$attachment->downloads} Mal heruntergeladen{if $attachment->downloads > 0}, zuletzt: {@$attachment->lastDownloadTime|time}{/if})]]>
@@ -4164,14 +4164,14 @@ Dateianhänge:
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar zum Moderationseintrag {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Kommentare zum Moderationseintrag {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar zum Moderationseintrag {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zum Moderationseintrag {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zum Moderationseintrag {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:
]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} zum Moderationseintrag {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Antworten zum Kommentar zum Moderationseintrag {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zum Kommentar von {$commentAuthor->username} zum Moderationseintrag {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} zum Moderationseintrag {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} zum Moderationseintrag {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:]]>
@@ -4213,14 +4213,14 @@ Dateianhänge:
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar zum freizuschaltenden Inhalt {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Kommentare zum freizuschaltenden Inhalt {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar zum freizuschaltenden Inhalt {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zum freizuschaltenden Inhalt {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zum freizuschaltenden Inhalt {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} zum freizuschaltenden Inhalt {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Antworten zu Kommentaren zum freizuschaltenden Inhalt {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zum Kommentar von {$commentAuthor} zum freizuschaltenden Inhalt {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} zum freizuschaltenden Inhalt {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} zum freizuschaltenden Inhalt {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:]]>
@@ -4232,14 +4232,14 @@ Dateianhänge:
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar zur Meldung {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Kommentare zur Meldung {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar zur Meldung {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zu der Meldung {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zu der Meldung {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} zur Meldung {$moderationQueue->getTitle()} verfasst.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben Antworten zu Kommentare zur Meldung {$moderationQueue->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zum Kommentar von {$commentAuthor} zur Meldung {$moderationQueue} verfasst.]]>
+ - {$moderationQueue} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} zur Meldung {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} zur Meldung {$notificationContent[variables][moderationQueue]->getTitle()} verfasst:]]>
@@ -4320,7 +4320,7 @@ Dateianhänge:
- Nutzungsbedingungen]]>
- - getTitle()}â läuft {dateInterval start=$notification->time end=$userNotificationObject->endDate format='sentence'} (am {$userNotificationObject->endDate|date:'d. F'}) ab.]]>
+ - {$userNotificationObject->getTitle()} läuft {dateInterval start=$notification->time end=$userNotificationObject->endDate format='sentence'} (am {$userNotificationObject->endDate|date:'d. F'}) ab.]]>
- getTitle()}â läuft {dateInterval start=$notification->time end=$subscription->endDate format='sentence'} (am {@$subscription->endDate|date:'d. F'}) ab.]]>
- {if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Mitgliedschaft â{$subscription->getTitle()}â läuft {dateInterval start=$notification->time end=$subscription->endDate format='sentence'} (am {$subscription->endDate|date:'d. F'}) ab.]]>
@@ -5045,40 +5045,40 @@ Benachrichtigungen auf {PAGE_TITLE|lang
Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} keine E-Mail-Benachrichtigungen mehr erhalten {if LANGUAGE_USE_INFORMAL_VARIANT}möchtest{else}möchten{/if}, dann {if LANGUAGE_USE_INFORMAL_VARIANT}kannst du{else}können Sie{/if} diese direkt abbestellen.
]]>
- getAuthor()->userID}{if $guestTimesTriggered > 1}Gäste{else}Ein Gast{/if}{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->username} [URL:{link controller='User' object=$authors[1] isEmail=true}{/link}]{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if}{@$authors[2]->username} [URL:{link controller='User' object=$authors[2] isEmail=true}{/link}]{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} und{/if} {#$count-1} weitere Benutzer{/if}{if $event->getAuthor()->userID && $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}{#$guestTimesTriggered} Gäste{/if}{/if}]]>
- getAuthor()->userID}{if $guestTimesTriggered > 1}Gäste{else}Ein Gast{/if}{else}{$event->getAuthor()->username}{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if}{$authors[2]->username}{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} und{/if} {#$count-1} weitere Benutzer{/if}{if $event->getAuthor()->userID && $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}{#$guestTimesTriggered} Gäste{/if}{/if}]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} und {plural value=$guestTimesTriggered one='ein Gast' other='# Gäste'}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {plural value=$guestTimesTriggered one='ein Gast' other='# Gäste'}{/if}{/if}]]>
+ - {$authors[0]}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{$authors[1]}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {$authors[2]}{/if}{/if}{if $guestTimesTriggered} und {plural value=$guestTimesTriggered one='ein Gast' other='# Gäste'}{/if}{else}{$authors[0]}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {plural value=$guestTimesTriggered one='ein Gast' other='# Gäste'}{/if}{/if}]]>
- - getAnchorTag()} folgt {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if}.]]>
- - getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} folgen {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if}.]]>
+ - {$author} folgt {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if}.]]>
+
- {@$authorList} {if $count == 1}folgt{else}folgen{/if} {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if}:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
- - getUser()}#wall/comment{@$commentID}{/link}">{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand
verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
+
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall/comment{@$commentID}{/link}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:]]>
- - getAnchorTag()} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$owner}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an {if $owner->userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} verfasst.]]>
- - userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} geantwortet.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an {if $owner->userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner}{/if} verfasst.]]>
+ - userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner}{/if} geantwortet.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {@$notificationContent[variables][owner]->username}{/if} [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall/comment{@$commentID}/response{@$responseID}{/link}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$notificationContent[variables][owner]->username}{/if} verfasst:]]>
- - getAnchorTag()} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Antwort auf einen Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Antwort auf einen Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Antwort auf einen Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$owner}{/if} reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
- - userID}{$author->username}{else}{$author->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand geantwortet.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zum Kommentar von {$commentAuthor} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
+ - {$author} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand geantwortet.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall/comment{@$commentID}/response{@$responseID}{/link}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:]]>
@@ -5089,7 +5089,7 @@ Benachrichtigungen auf {PAGE_TITLE|lang
- - getTrophy()->getLink()}">{$userTrophy->getTrophy()->getTitle()}
erhalten.]]>
+ - {$userTrophy->getTrophy()} erhalten.]]>
@@ -5102,20 +5102,20 @@ Benachrichtigungen auf {PAGE_TITLE|lang
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar auf der Seite {$page->getTitle()} verfasst.]]>
- - getLink()}#comment{@$commentID}">{$page->getTitle()}
verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar auf der Seite {$page->getTitle()} verfasst.]]>
+ - {$page->getTitle()} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} auf der Seite â{@$notificationContent[variables][page]->getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} auf der Seite {$notificationContent[variables][page]->getTitle()} verfasst:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zu dem Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} auf der Seite {$page->getTitle()} verfasst.]]>
- - userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} auf der Seite {$page->getTitle()} geantwortet.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zu dem Kommentar von {$commentAuthor} auf der Seite {$page->getTitle()} verfasst.]]>
+ - {$commentAuthor} auf der Seite {$page->getTitle()} geantwortet.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} auf der Seite â{@$notificationContent[variables][page]->getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}/response{@$responseID}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} auf der Seite {$notificationContent[variables][page]->getTitle()} verfasst:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite {$page->getTitle()} verfasst.]]>
- - getLink()}#comment{@$commentID}">{$page->getTitle()} geantwortet.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite {$page->getTitle()} verfasst.]]>
+ - {$page->getTitle()} geantwortet.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite â{@$notificationContent[variables][page]->getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}/response{@$responseID}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite {$notificationContent[variables][page]->getTitle()} verfasst:]]>
@@ -5123,25 +5123,25 @@ Benachrichtigungen auf {PAGE_TITLE|lang
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$article->getTitle()} verfasst.]]>
- - getLink()}#comment{@$commentID}">{$article->getTitle()}
verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat einen Kommentar zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$article->getTitle()} verfasst.]]>
+ - {$article->getTitle()} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel â{@$notificationContent[variables][article]->getTitle()}â [URL:{@$notificationContent[variables][article]->getLink()}#comment{@$commentID}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat einen Kommentar{else}haben Kommentare{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$notificationContent[variables][article]->getTitle()} verfasst:]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar in dem Artikel {$article->getTitle()} verfasst.]]>
- - getLink()}#comment{@$commentID}">{$article->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar in dem Artikel {$article->getTitle()} verfasst.]]>
+ - {$article->getTitle()} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar zu dem Artikel â{@$notificationContent[variables][article]->getTitle()}â [URL:{link controller='Article' object=$notificationContent[variables][article] isEmail=true}#comments/comment{@$commentID}/response{@$responseID}{/link}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar zu dem Artikel {$notificationContent[variables][article]->getTitle()} verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- - userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$article->getTitle()} verfasst.]]>
- - userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$article->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat eine Antwort zum Kommentar von {$commentAuthor} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$article->getTitle()} verfasst.]]>
+ - {$article->getTitle()} verfasst.]]>
- getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel â{@$notificationContent[variables][article]->getTitle()}â [URL:{link controller='Article' object=$notificationContent[variables][article] isEmail=true}#comments/comment{@$commentID}/response{@$responseID}{/link}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{@$notificationContent[variables][commentAuthor]->username}{else}{@$notificationContent[variables][commentAuthor]->username}{/if} zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Artikel {$notificationContent[variables][article]->getTitle()} verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- - userID}{@$author->getAnchorTag()}{else}Ein Gast{/if} hat den Artikel {$article->getTitle()} verfasst.]]>
+ - userID}{$author}{else}Ein Gast{/if} hat den Artikel {$article->getTitle()} verfasst.]]>
- getAuthor()->userID}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{else}Ein Gast{/if} hat den Artikel â{@$notificationContent[variables][articleContent]->getTitle()}â [URL:{link controller='Article' object=$notificationContent[variables][articleContent] isEmail=true}{/link}] verfasst:]]>
- {if $event->getAuthor()->userID}{$event->getAuthor()->username}{else}Ein Gast{/if} hat den Artikel {$notificationContent[variables][articleContent]->getTitle()} verfasst:]]>
@@ -5149,8 +5149,8 @@ Benachrichtigungen auf {PAGE_TITLE|lang
- - getAnchorTag()} hat sich registriert.]]>
- - getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$others} weitere Benutzer{/if} haben sich registriert.]]>
+ - {$author} hat sich registriert.]]>
+
- {@$authorList} {if $count == 1}hat{else}haben{/if} sich registriert:]]>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index fec9ca4544..64120a81d8 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3175,8 +3175,8 @@ full extend.]]>
- - getAnchorTag()} reacted to your article {$article->getTitle()} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} reacted to article {$article->getTitle()} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} reacted to your article {$article->getTitle()} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$article->getTitle()} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- filesize|filesize}, downloaded {#$attachment->downloads} times{if $attachment->downloads > 0}, last: {@$attachment->lastDownloadTime|time}{/if})]]>
@@ -4109,14 +4109,14 @@ Attachments:
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} commented on the moderation entry {$moderationQueue->getTitle()}.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} commented on the moderation entry {$moderationQueue->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} commented on the moderation entry {$moderationQueue}.]]>
+ - {$moderationQueue}.]]>
- getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} commented on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()}:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on the moderation entry {$moderationQueue->getTitle()}.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} replied to comments on the moderation entry {$moderationQueue->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to a comment by {$commentAuthor} on the moderation entry {$moderationQueue}.]]>
+ - {$moderationQueue}.]]>
- username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on the moderation entry {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()}:]]>
@@ -4158,14 +4158,14 @@ Attachments:
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} commented on {$moderationQueue->getTitle()} waiting for approval.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} commented on {$moderationQueue->getTitle()} waiting for approval.]]>
+ - userID}{$author}{else}A guest{/if} commented on {$moderationQueue} waiting for approval.]]>
+ - {$moderationQueue} waiting for approval.]]>
- getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] waiting for approval{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} commented on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()} waiting for approval:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on {$moderationQueue->getTitle()} waiting for approval.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} replied to comments on {$moderationQueue->getTitle()} waiting for approval.]]>
+ - userID}{$author}{else}A guest{/if} replied to a comment by {$commentAuthor} on {$moderationQueue} waiting for approval.]]>
+ - {$moderationQueue} waiting for approval.]]>
- username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}] waiting for approval{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on {$notificationContent[variables][moderationQueue]->getTitle()} waiting for approval:]]>
@@ -4177,14 +4177,14 @@ Attachments:
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} commented on the report {$moderationQueue->getTitle()}.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} commented on the report {$moderationQueue->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} commented on the report {$moderationQueue}.]]>
+ - {$moderationQueue}.]]>
- getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} commented on the report {$notificationContent[variables][moderationQueue]->getTitle()}:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on the report {$moderationQueue->getTitle()}.]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} replied to comments on the report {$moderationQueue->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to a comment by {$commentAuthor->username} on the report {$moderationQueue}.]]>
+ - {$moderationQueue->getTitle()}.]]>
- username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on the report {@$notificationContent[variables][moderationQueue]->getTitle()} [URL:{@$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on the report {$notificationContent[variables][moderationQueue]->getTitle()}:]]>
@@ -4321,7 +4321,7 @@ Attachments:
- Terms of Service
]]>
- - getTitle()}â will expire {dateInterval start=$notification->time end=$userNotificationObject->endDate format='sentence'} (on {$userNotificationObject->endDate|date:'F jS'}).]]>
+ - {$userNotificationObject->getTitle()} will expire {dateInterval start=$notification->time end=$userNotificationObject->endDate format='sentence'} (on {$userNotificationObject->endDate|date:'F jS'}).]]>
- getTitle()}â will expire {dateInterval start=$notification->time end=$subscription->endDate format='sentence'} (on {@$subscription->endDate|date:'F jS'}).]]>
- getTitle()}â will expire {dateInterval start=$notification->time end=$subscription->endDate format='sentence'} (on {$subscription->endDate|date:'F jS'}).]]>
@@ -5042,40 +5042,40 @@ your notifications on {PAGE_TITLE|langu
You can disable all email notifications as well.
]]>
- getAuthor()->userID}{if $guestTimesTriggered > 1}Guests{else}A guest{/if}{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username} [URL:{link controller='User' object=$authors[1] isEmail=true}{/link}]{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if}{@$authors[2]->username} [URL:{link controller='User' object=$authors[2] isEmail=true}{/link}]{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} and{/if} {#$count-1} other users{/if}{if $event->getAuthor()->userID && $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}{#$guestTimesTriggered} guests{/if}{/if}]]>
- getAuthor()->userID}{if $guestTimesTriggered > 1}Guests{else}A guest{/if}{else}{$event->getAuthor()->username}{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if}{$authors[2]->username}{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} and{/if} {#$count-1} other users{/if}{if $event->getAuthor()->userID && $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}{#$guestTimesTriggered} guests{/if}{/if}]]>
- - getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} and {plural value=$guestTimesTriggered one='a guest' other='# guests'}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {plural value=$guestTimesTriggered one='a guest' other='# guests'}{/if}{/if}]]>
+ - {$authors[0]}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{$authors[1]}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {$authors[2]}{/if}{/if}{if $guestTimesTriggered} and {plural value=$guestTimesTriggered one='a guest' other='# guests'}{/if}{else}{$authors[0]}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {plural value=$guestTimesTriggered one='a guest' other='# guests'}{/if}{/if}]]>
- - getAnchorTag()} follows you.]]>
- - getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} follow you.]]>
+ - {$author} follows you.]]>
+
- {@$authorList} {if $authors|count == 1}follows{else}follow{/if} you:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} commented on your wall.]]>
- - getUser()}#wall/comment{@$commentID}{/link}">your wall
.]]>
+ - userID}{$author}{else}A guest{/if} commented on your wall.]]>
+
- {@$authorList} commented on your wall:]]>
- - getAnchorTag()} reacted to your comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} reacted to your comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} reacted to your comment on {if $owner === null}your wall{else}{$owner}âs{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$owner}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to your comment on {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner->username}âs{/if} wall.]]>
- - {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner->username}âs{/if} wall.]]>
+ - userID}{$author}{else}A guest{/if} replied to your comment on {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner}âs{/if} wall.]]>
+ - userID == $__wcf->getUser()->userID}your{else}{$owner}âs{/if} wall.]]>
- getUser()->userID == $notificationContent[variables][owner]->userID}your{else}{@$notificationContent[variables][owner]->username}âs{/if} wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall/comment{@$commentID}/response{@$responseID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to your comment on {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}your{else}{$notificationContent[variables][owner]->username}âs{/if} wall:]]>
- - getAnchorTag()} reacted to your reply to a comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} reacted to your reply to a comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$author} reacted to your reply to a comment on {if $owner === null}your wall{else}{$owner}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
+ - {$owner}âs wall{/if} ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to {$commentAuthor->username}âs comment on your wall.]]>
- - userID}{$author->username}{else}{$author->username}{/if} on your wall.]]>
+ - userID}{$author}{else}A guest{/if} replied to {$commentAuthor}âs comment on your wall.]]>
+ - {$author} on your wall.]]>
- username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on your wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall/comment{@$commentID}/response{@$responseID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on your wall:]]>
@@ -5086,7 +5086,7 @@ your notifications on {PAGE_TITLE|langu
- - getTrophy()->getLink()}">{$userTrophy->getTrophy()->getTitle()}
.]]>
+ - {$userTrophy->getTrophy()}.]]>
@@ -5099,20 +5099,20 @@ your notifications on {PAGE_TITLE|langu
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} commented on the page {$page->getTitle()}.]]>
- - getLink()}#comment{@$commentID}">{$page->getTitle()}
.]]>
+ - userID}{$author}{else}A guest{/if} commented on the page {$page->getTitle()}.]]>
+ - {$page->getTitle()}.]]>
- getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} commented on the page {$notificationContent[variables][page]->getTitle()}:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if}âs comment on the page {$page->getTitle()}.]]>
- - userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if}âs comment on the page {$page->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to {$commentAuthor}âs comment on the page {$page->getTitle()}.]]>
+ - {$commentAuthor}âs comment on the page {$page->getTitle()}.]]>
- username}âs comment on the page â{@$notificationContent[variables][page]->getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {@$notificationContent[variables][commentAuthor]->username}âs comment on the page {$notificationContent[variables][page]->getTitle()}:]]>
- - userID}A guest{else}{@$author->getAnchorTag()}{/if} replied to your comment on the page {$page->getTitle()}.]]>
- - getLink()}#comment{@$commentID}">{$page->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to your comment on the page {$page->getTitle()}.]]>
+ - {$page->getTitle()}.]]>
- getTitle()}â [URL:{@$notificationContent[variables][page]->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to your comment on the page {$notificationContent[variables][page]->getTitle()}:]]>
@@ -5120,25 +5120,25 @@ your notifications on {PAGE_TITLE|langu
- - userID}{@$author->getAnchorTag()}{else}A guest{/if} commented on your article {$article->getTitle()}.]]>
- - {$article->getTitle()}
.]]>
+ - userID}{$author}{else}A guest{/if} commented on your article {$article->getTitle()}.]]>
+ - {$article->getTitle()}.]]>
- getTitle()}â [URL:{link controller='Article' object=$article isEmail=true}#comment{@$commentID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} commented on your article {$article->getTitle()}:]]>
- - userID}{@$author->getAnchorTag()}{else}A guest{/if} replied to your comment on the article {$article->getTitle()}.]]>
- - {$article->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to your comment on the article {$article->getTitle()}.]]>
+ - {$article->getTitle()}.]]>
- getTitle()}â [URL:{link controller='Article' object=$article isEmail=true}#comments/comment{@$commentID}/response{@$responseID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to your comment on the article {$article->getTitle()}:]]>
- - userID}{@$author->getAnchorTag()}{else}A guest{/if} replied to a comment by {$commentAuthor->username} on your article {$article->getTitle()}.]]>
- - userID}{$author->username}{else}{$author->username}{/if} on your article {$article->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} replied to a comment by {$commentAuthor} on your article {$article->getTitle()}.]]>
+ - {$author} on your article {$article->getTitle()}.]]>
- username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on your article â{@$article->getTitle()}â [URL:{link controller='Article' object=$article isEmail=true}#comments/comment{@$commentID}/response{@$responseID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- {@$authorList} replied to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on your article {$article->getTitle()}:]]>
- - userID}{@$author->getAnchorTag()}{else}A guest{/if} wrote the article {$article->getTitle()}.]]>
+ - userID}{$author}{else}A guest{/if} wrote the article {$article->getTitle()}.]]>
- getAuthor()->userID}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{else}A guest{/if} wrote the article â{@$notificationContent[variables][articleContent]->getTitle()}â [URL:{link controller='Article' object=$notificationContent[variables][articleContent] isEmail=true}{/link}]:]]>
- {if $event->getAuthor()->userID}{$event->getAuthor()->username}{else}A guest{/if} wrote the article {$notificationContent[variables][articleContent]->getTitle()}:]]>
@@ -5147,8 +5147,8 @@ your notifications on {PAGE_TITLE|langu
- - getAnchorTag()} has registered.]]>
- - getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} have registered.]]>
+ - {$author} has registered.]]>
+
- {@$authorList} {if $count == 1}has{else}have{/if} registered:]]>
--
2.20.1