From 063b85330577d5d03ac2de33f68fe15a174848fc Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com> Date: Wed, 30 Sep 2020 15:51:00 -0400 Subject: [PATCH] Translate notification emails (#30) --- .../src/Notification/NewPostBlueprint.php | 5 +++-- .../views/emails/newPost.blade.php | 21 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/extensions/subscriptions/src/Notification/NewPostBlueprint.php b/extensions/subscriptions/src/Notification/NewPostBlueprint.php index 99158182b..409cf54ca 100644 --- a/extensions/subscriptions/src/Notification/NewPostBlueprint.php +++ b/extensions/subscriptions/src/Notification/NewPostBlueprint.php @@ -13,6 +13,7 @@ use Flarum\Discussion\Discussion; use Flarum\Notification\Blueprint\BlueprintInterface; use Flarum\Notification\MailableInterface; use Flarum\Post\Post; +use Symfony\Component\Translation\TranslatorInterface; class NewPostBlueprint implements BlueprintInterface, MailableInterface { @@ -64,9 +65,9 @@ class NewPostBlueprint implements BlueprintInterface, MailableInterface /** * {@inheritdoc} */ - public function getEmailSubject() + public function getEmailSubject(TranslatorInterface $translator) { - return '[New Post] '.$this->post->discussion->title; + return $translator->trans('flarum-subscriptions.email.new_post.subject', ['{title}' => $this->post->discussion->title]); } /** diff --git a/extensions/subscriptions/views/emails/newPost.blade.php b/extensions/subscriptions/views/emails/newPost.blade.php index 940c6d23b..e1c11e7d4 100644 --- a/extensions/subscriptions/views/emails/newPost.blade.php +++ b/extensions/subscriptions/views/emails/newPost.blade.php @@ -1,14 +1,7 @@ -Hey {!! $user->display_name !!}! - -{!! $blueprint->post->user->display_name !!} made a post in a discussion you're following: {!! $blueprint->post->discussion->title !!} - -To view the new activity, check out the following link: -{!! app()->url() !!}/d/{!! $blueprint->post->discussion_id !!}/{!! $blueprint->post->number !!} - ---- - -{!! $blueprint->post->content !!} - ---- - -You won't receive any more notifications about this discussion until you're up-to-date. +{!! $translator->trans('flarum-subscriptions.email.new_post.body', [ +'{recipient_display_name}' => $user->display_name, +'{poster_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 +]) !!}