From: Marcel Werk Date: Fri, 7 Jun 2013 20:06:19 +0000 (+0200) Subject: Improved e-mail notifications X-Git-Tag: 2.0.0_Beta_4~107 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7331c23061a6b006c8231e8c1449732bdc0b70bc;p=GitHub%2FWoltLab%2FWCF.git Improved e-mail notifications --- diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php index e20a2cd01b..b5570d2eeb 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php @@ -47,9 +47,11 @@ class UserProfileCommentResponseOwnerUserNotificationEvent extends AbstractUserN $owner = new User($comment->objectID); return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponseOwner.mail', array( + 'response' => $this->userNotificationObject, 'author' => $this->author, 'commentAuthor' => $commentAuthor, - 'owner' => $owner + 'owner' => $owner, + 'notificationType' => $notificationType )); } diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php index 54772a584e..26a613551f 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php @@ -45,8 +45,10 @@ class UserProfileCommentResponseUserNotificationEvent extends AbstractUserNotifi $user = new User($comment->objectID); return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponse.mail', array( + 'response' => $this->userNotificationObject, 'author' => $this->author, - 'owner' => $user + 'owner' => $user, + 'notificationType' => $notificationType )); } diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php index e562acf24f..c0eb133db7 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php @@ -39,8 +39,10 @@ class UserProfileCommentUserNotificationEvent extends AbstractUserNotificationEv $user = new User($this->userNotificationObject->objectID); return $this->getLanguage()->getDynamicVariable('wcf.user.notification.comment.mail', array( + 'comment' => $this->userNotificationObject, 'author' => $this->author, - 'owner' => $user + 'owner' => $user, + 'notificationType' => $notificationType )); } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index fe3e0995ae..eeae882054 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2253,15 +2253,27 @@ Möchten Sie diese E-Mail-Benachrichtigung in Zukunft nicht mehr erhalten, könn username} hat einen Kommentar an Ihrer Pinnwand verfasst: -{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$comment->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> username} verfasst.]]> username} hat eine Antwort zu Ihrem Kommentar an der Pinnwand von "{@$owner->username}" verfasst: -{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> username} an Ihrer Pinnwand verfasst.]]> username} hat eine Antwort zum Kommentar von "{@$commentAuthor->username}" an Ihrer Pinnwand verfasst: -{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 4fcc336046..2d19e03039 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2209,15 +2209,27 @@ If you do not want to receive further email notifications for this event, you ca username} wrote a comment on your wall: -{link controller='User' object=$owner encode=false forceFrontend=true}#wall{/link}]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$comment->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}#wall{/link}]]> username}’s wall.]]> username} wrote a reply to your comment on {@$owner->username}’s wall: -{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> username}’s comment on your wall.]]> username} wrote a reply to {@$commentAuthor->username}’s comment on your wall: -{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]> +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{link controller='User' object=$owner encode=false forceFrontend=true}{/link}#wall]]>