use markdown in email footer translations

flarum · Sep 18, 2023 · d3f4b5f · d3f4b5f
1 parent b0d688e
commit d3f4b5f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/framework/core/locale/core.yml b/framework/core/locale/core.yml
@@ -753,17 +753,19 @@ core:
     # These translations are used by the "informational" email template.
     informational:
       default_title: "Information"
-      footer: "This email was sent to {userEmail} as an informational service related to your account on {forumTitle}."#
+      footer: "This email was sent to {userEmail} as an informational service related to your account on [{forumTitle}]({forumUrl})."
+      footer_plain: "This email was sent to {userEmail} as an informational service related to your account on {forumTitle}."
 
     # These translations are used by the "notification" email template.
     notification:
         default_title: "Notification"
         footer:
-          main_text: "This email was sent to {email} because you are subscribed to \"{type}\" notifications on {forumTitle}."
-          unsubscribe_text: "If you'd like to stop receiving this type of notification, <a href=\"{unsubscribeLink}\">unsubscribe here</a>."
+          main_text: "This email was sent to {email} because you are subscribed to \"{type}\" notifications on [{forumTitle}]({forumUrl})."
+          main_text_plain: "This email was sent to {email} because you are subscribed to \"{type}\" notifications on {forumTitle}."
+          unsubscribe_text: "If you'd like to stop receiving this type of notification, [unsubscribe here]({unsubscribeLink})."
           unsubscribe_text_plain: "If you'd like to stop receiving this type of notification, unsubscribe here: {unsubscribeLink}"
-          settings_text: "Manage your notification settings <a href=\"{settingsLink}\">here</a>."
-          settings_text_plain: "Manage your notification settings <a href=\"{settingsLink}\">here</a>."
+          settings_text: "Manage your notification settings [here]({settingsLink})."
+          settings_text_plain: "Manage your notification settings here: {settingsLink}"
 
     # These translations are used in emails sent when users register new accounts.
     activate_account:

diff --git a/framework/core/views/email/html/information/base.blade.php b/framework/core/views/email/html/information/base.blade.php
@@ -12,5 +12,5 @@
 @endsection
 
 @section('footer')
-    <p>{!! $translator->trans('core.email.informational.footer', ['userEmail' => $userEmail, 'forumTitle' => '<a href="' . $url->to('forum')->base() . '">' . $settings->get('forum_title') . '</a>']) !!}</p>
+    <p>{!! $formatter->convert($translator->trans('core.email.informational.footer', ['userEmail' => $userEmail, 'forumUrl' => $url->to('forum')->base(), 'forumTitle' => $settings->get('forum_title')])) !!}</p>
 @endsection
diff --git a/framework/core/views/email/html/notification/base.blade.php b/framework/core/views/email/html/notification/base.blade.php
@@ -12,7 +12,7 @@
 @endsection
 
 @section('footer')
-    <p>{!! $translator->trans('core.email.notification.footer.main_text', ['email' => $user->email, 'type' => $type, 'forumTitle' => '<a href="' . $url->to('forum')->base() . '">' . $settings->get('forum_title') . '</a>']) !!}</p>
-    <p>{!! $translator->trans('core.email.notification.footer.unsubscribe_text', ['unsubscribeLink' => $unsubscribeLink]) !!}</p>
-    <p>{!! $translator->trans('core.email.notification.footer.settings_text', ['settingsLink' => $settingsLink]) !!}</p>
+    <p>{!! $formatter->convert($translator->trans('core.email.notification.footer.main_text', ['email' => $user->email, 'type' => $type, 'forumUrl' => $url->to('forum')->base(), 'forumTitle' => $settings->get('forum_title')])) !!}</p>
+    <p>{!! $formatter->convert($translator->trans('core.email.notification.footer.unsubscribe_text', ['unsubscribeLink' => $unsubscribeLink])) !!}</p>
+    <p>{!! $formatter->convert($translator->trans('core.email.notification.footer.settings_text', ['settingsLink' => $settingsLink])) !!}</p>
 @endsection
diff --git a/framework/core/views/email/plain/information/base.blade.php b/framework/core/views/email/plain/information/base.blade.php
@@ -9,5 +9,5 @@
 @endsection
 
 @section('footer')
-{!! $translator->trans('core.email.informational.footer', ['userEmail' => $userEmail, 'forumTitle' => $forumTitle]) !!}
+{!! $translator->trans('core.email.informational.footer_plain', ['userEmail' => $userEmail, 'forumTitle' => $forumTitle]) !!}
 @endsection
diff --git a/framework/core/views/email/plain/notification/base.blade.php b/framework/core/views/email/plain/notification/base.blade.php
@@ -9,7 +9,7 @@
 @endsection
 
 @section('footer')
-{!! $translator->trans('core.email.notification.footer.main_text', ['email' => $user->email, 'type' => $type, 'forumTitle' => $forumTitle]) !!}
+{!! $translator->trans('core.email.notification.footer.main_text_plain', ['email' => $user->email, 'type' => $type, 'forumTitle' => $forumTitle]) !!}
 
 {!! $translator->trans('core.email.notification.footer.unsubscribe_text_plain', ['unsubscribeLink' => $unsubscribeLink]) !!}