From: Marcel Werk
Date: Sat, 23 May 2020 17:49:57 +0000 (+0200)
Subject: Merge branch '5.2'
X-Git-Tag: 5.3.0_Alpha_1~266
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59ea46cac9bc29e5465d18f7ecc623a937c979bb;p=GitHub%2FWoltLab%2FWCF.git
Merge branch '5.2'
---
59ea46cac9bc29e5465d18f7ecc623a937c979bb
diff --cc wcfsetup/install/lang/en.xml
index 76544be87a,9ba53b5b93..dd0465612c
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5126,19 -5109,19 +5126,19 @@@ your notifications on {@$authorList} commented on your article {$article->getTitle()}:
]]>
- - userID}{@$author->getAnchorTag()}{else}A guest{/if} replied to your comment on the article {$article->getTitle()}.]]>
- - 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 {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to your comment on the article {$article->getTitle()}.]]>
- - getTitle()}â [URL:{link controller='Article' object=$article isEmail=true}#comments/comment{@$commentID}/response{@$responseID}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]>
- - {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a reply{else}replies{/if} to your comment on the article {$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()}.]]>
- - 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 {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} 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} wrote {if $count == 1 && !$guestTimesTriggered}a reply{else}replies{/if} 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}{else}A guest{/if} replied to a comment by {$commentAuthor} on your article {$article->getTitle()}.]]>
- - {$author} on your article {$article->getTitle()}.]]>
++ - {$commentAuthor} 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()}:]]>