diff --git a/extensions/mentions/src/Notification/PostMentionedBlueprint.php b/extensions/mentions/src/Notification/PostMentionedBlueprint.php index cb712f6f6..e8038a504 100644 --- a/extensions/mentions/src/Notification/PostMentionedBlueprint.php +++ b/extensions/mentions/src/Notification/PostMentionedBlueprint.php @@ -12,6 +12,7 @@ namespace Flarum\Mentions\Notification; use Flarum\Notification\Blueprint\BlueprintInterface; use Flarum\Notification\MailableInterface; use Flarum\Post\Post; +use Symfony\Component\Translation\TranslatorInterface; class PostMentionedBlueprint implements BlueprintInterface, MailableInterface { @@ -70,9 +71,12 @@ class PostMentionedBlueprint implements BlueprintInterface, MailableInterface /** * {@inheritdoc} */ - public function getEmailSubject() + public function getEmailSubject(TranslatorInterface $translator) { - return "{$this->reply->user->display_name} replied to your post in {$this->post->discussion->title}"; + return $translator->trans('flarum-mentions.email.post_mentioned.subject', [ + '{replier_display_name}' => $this->post->user->display_name, + '{title}' => $this->post->discussion->title + ]); } /** diff --git a/extensions/mentions/src/Notification/UserMentionedBlueprint.php b/extensions/mentions/src/Notification/UserMentionedBlueprint.php index bf03d2e2f..5d6f93922 100644 --- a/extensions/mentions/src/Notification/UserMentionedBlueprint.php +++ b/extensions/mentions/src/Notification/UserMentionedBlueprint.php @@ -12,6 +12,7 @@ namespace Flarum\Mentions\Notification; use Flarum\Notification\Blueprint\BlueprintInterface; use Flarum\Notification\MailableInterface; use Flarum\Post\Post; +use Symfony\Component\Translation\TranslatorInterface; class UserMentionedBlueprint implements BlueprintInterface, MailableInterface { @@ -62,9 +63,12 @@ class UserMentionedBlueprint implements BlueprintInterface, MailableInterface /** * {@inheritdoc} */ - public function getEmailSubject() + public function getEmailSubject(TranslatorInterface $translator) { - return "{$this->post->user->display_name} mentioned you in {$this->post->discussion->title}"; + return $translator->trans('flarum-mentions.email.user_mentioned.subject', [ + '{mentioner_display_name}' => $this->post->user->display_name, + '{title}' => $this->post->discussion->title + ]); } /** diff --git a/extensions/mentions/views/emails/postMentioned.blade.php b/extensions/mentions/views/emails/postMentioned.blade.php index b9fdf86b9..052a016b6 100644 --- a/extensions/mentions/views/emails/postMentioned.blade.php +++ b/extensions/mentions/views/emails/postMentioned.blade.php @@ -1,9 +1,8 @@ -Hey {!! $user->display_name !!}! - -{!! $blueprint->reply->user->display_name !!} replied to your post (#{!! $blueprint->post->number !!}) in {!! $blueprint->post->discussion->title !!}. - -{!! app()->url() !!}/d/{!! $blueprint->reply->discussion_id !!}/{!! $blueprint->reply->number !!} - ---- - -{!! $blueprint->reply->content !!} +{!! $translator->trans('flarum-mentions.email.post_mentioned.body', [ +'{recipient_display_name}' => $user->display_name, +'{replier_display_name}' => $blueprint->post->user->display_name, +'{post_number}' => $blueprint->post->number, +'{title}' => $blueprint->post->discussion->title, +'{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->reply->discussion_id, 'near' => $blueprint->reply->number]), +'{content}' => $blueprint->reply->content +]) !!} diff --git a/extensions/mentions/views/emails/userMentioned.blade.php b/extensions/mentions/views/emails/userMentioned.blade.php index 0ec059878..9d3881607 100644 --- a/extensions/mentions/views/emails/userMentioned.blade.php +++ b/extensions/mentions/views/emails/userMentioned.blade.php @@ -1,9 +1,7 @@ -Hey {!! $user->display_name !!}! - -{!! $blueprint->post->user->display_name !!} mentioned you in a post in {!! $blueprint->post->discussion->title !!}. - -{!! app()->url() !!}/d/{!! $blueprint->post->discussion_id !!}/{!! $blueprint->post->number !!} - ---- - -{!! $blueprint->post->content !!} +{!! $translator->trans('flarum-mentions.email.user_mentioned.body', [ +'{recipient_display_name}' => $user->display_name, +'{mentioner_display_name}' => $blueprint->post->user->display_name, +'{title}' => $blueprint->post->discussion->title, +'{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]), +'{content}' => $blueprint->post->content +]) !!}