Skip to content

Commit 2a357b7

Browse files
imorlandimorland
authored
fix: remove email workaround needed for earlier betas (#91)
1 parent 9386ad2 commit 2a357b7

File tree

6 files changed

+43
-19
lines changed

6 files changed

+43
-19
lines changed

‎resources/views/email/html/newDiscussion.blade.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
<x-mail::html.notification :preview="$blueprint->post->formatContent()">
2-
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newDiscussionInTag.html.body', [
3-
'{actor_display_name}' => $blueprint->discussion->user->display_name,
4-
'{discussion_title}' => $blueprint->discussion->title,
5-
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
6-
])) !!}
1+
<x-mail::html.notification>
2+
<x-slot:body>
3+
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newDiscussionInTag.html.body', [
4+
'{actor_display_name}' => $blueprint->discussion->user->display_name,
5+
'{discussion_title}' => $blueprint->discussion->title,
6+
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
7+
])) !!}
8+
</x-slot:body>
9+
10+
<x-slot:preview>
11+
{!! $blueprint->post->formatContent() !!}
12+
</x-slot:preview>
713
</x-mail::html.notification>

‎resources/views/email/html/newPost.blade.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
<x-mail::html.notification :preview="$blueprint->post->formatContent()">
2-
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newPostInTag.html.body', [
3-
'{actor_display_name}' => $blueprint->post->user->display_name,
4-
'{discussion_title}' => $blueprint->post->discussion->title,
5-
'{post_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]),
6-
])) !!}
1+
<x-mail::html.notification>
2+
<x-slot:body>
3+
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newPostInTag.html.body', [
4+
'{actor_display_name}' => $blueprint->post->user->display_name,
5+
'{discussion_title}' => $blueprint->post->discussion->title,
6+
'{post_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]),
7+
])) !!}
8+
</x-slot:body>
9+
10+
<x-slot:preview>
11+
{!! $blueprint->post->formatContent() !!}
12+
</x-slot:preview>
713
</x-mail::html.notification>

‎resources/views/email/html/newTag.blade.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
<x-mail::html.notification :preview="$blueprint->post->formatContent()">
2-
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newDiscussionTag.html.body', [
3-
'{actor_display_name}' => $blueprint->actor->display_name,
4-
'{author_display_name}' => $blueprint->discussion->user->display_name,
5-
'{discussion_title}' => $blueprint->discussion->title,
6-
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
7-
])) !!}
1+
<x-mail::html.notification>
2+
<x-slot:body>
3+
{!! $formatter->convert($translator->trans('fof-follow-tags.email.newDiscussionTag.html.body', [
4+
'{actor_display_name}' => $blueprint->actor->display_name,
5+
'{author_display_name}' => $blueprint->discussion->user->display_name,
6+
'{discussion_title}' => $blueprint->discussion->title,
7+
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
8+
])) !!}
9+
</x-slot:body>
10+
11+
<x-slot:preview>
12+
{!! $blueprint->post->formatContent() !!}
13+
</x-slot:preview>
814
</x-mail::html.notification>

‎resources/views/email/plain/newDiscussion.blade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<x-mail::plain.notification>
2+
<x-slot:body>
23
{!! $translator->trans('fof-follow-tags.email.newDiscussionInTag.plain.body', [
34
'{actor_display_name}' => $blueprint->discussion->user->display_name,
45
'{discussion_title}' => $blueprint->discussion->title,
56
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
67
'{content}' => $blueprint->post->content
78
]) !!}
9+
</x-slot:body>
810
</x-mail::plain.notification>

‎resources/views/email/plain/newPost.blade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<x-mail::plain.notification>
2+
<x-slot:body>
23
{!! $translator->trans('fof-follow-tags.email.newPostInTag.plain.body', [
34
'{actor_display_name}' => $blueprint->post->user->display_name,
45
'{discussion_title}' => $blueprint->post->discussion->title,
56
'{post_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]),
67
'{content}' => $blueprint->post->content
78
]) !!}
9+
</x-slot:body>
810
</x-mail::plain.notification>

‎resources/views/email/plain/newTag.blade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<x-mail::plain.notification>
2+
<x-slot:body>
23
{!! $translator->trans('fof-follow-tags.email.newDiscussionTag.plain.body', [
34
'{actor_display_name}' => $blueprint->actor->display_name,
45
'{author_display_name}' => $blueprint->discussion->user->display_name,
56
'{discussion_title}' => $blueprint->discussion->title,
67
'{discussion_url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->discussion->id]),
78
'{content}' => $blueprint->post->content
89
]) !!}
10+
</x-slot:body>
911
</x-mail::plain.notification>

0 commit comments

Comments
 (0)