Notifications: Aligned how user language is used

[bookstack] / app / Notifications / UserInvite.php

diff --git a/app/Notifications/UserInvite.php b/app/Notifications/UserInvite.php
index 8804df586b7b8b4355b7e9b1dae8e716460da32f..87ea31c04b2b1b19ad37ae282572c8c4d28c1ca8 100644 (file)
--- a/app/Notifications/UserInvite.php
+++ b/app/Notifications/UserInvite.php
@@ -7,25 +7,17 @@ use Illuminate\Notifications\Messages\MailMessage;
 
 class UserInvite extends MailNotification
 {
-    public $token;
-
-    /**
-     * Create a new notification instance.
-     */
-    public function __construct(string $token)
-    {
-        $this->token = $token;
+    public function __construct(
+        public string $token
+    ) {
     }
 
-    /**
-     * Get the mail representation of the notification.
-     */
     public function toMail(User $notifiable): MailMessage
     {
         $appName = ['appName' => setting('app-name')];
-        $language = setting()->getUser($notifiable, 'language');
+        $language = $notifiable->getLanguage();
 
-        return $this->newMailMessage()
+        return $this->newMailMessage($language)
                 ->subject(trans('auth.user_invite_email_subject', $appName, $language))
                 ->greeting(trans('auth.user_invite_email_greeting', $appName, $language))
                 ->line(trans('auth.user_invite_email_text', [], $language))