Skip intermediate login page with single provider

[bookstack] / app / Notifications / UserInvite.php

diff --git a/app/Notifications/UserInvite.php b/app/Notifications/UserInvite.php
index b01911bcdc06780f31664d15bc5881d9d65aac2e..3bae32721ae69a4295e70395ba79c7a36c178e50 100644 (file)
--- a/app/Notifications/UserInvite.php
+++ b/app/Notifications/UserInvite.php
@@ -1,4 +1,9 @@
-<?php namespace BookStack\Notifications;
+<?php
+
+namespace BookStack\Notifications;
+
+use BookStack\Auth\User;
+use Illuminate\Notifications\Messages\MailMessage;

 
 class UserInvite extends MailNotification
 {
 
 class UserInvite extends MailNotification
 {


@@ -6,26 +11,24 @@ class UserInvite extends MailNotification
 
     /**
      * Create a new notification instance.
 
     /**
      * Create a new notification instance.

-     * @param string $token

      */
      */

-    public function __construct($token)
+    public function __construct(string $token)

     {
         $this->token = $token;
     }
 
     /**
      * Get the mail representation of the notification.
     {
         $this->token = $token;
     }
 
     /**
      * Get the mail representation of the notification.

-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage

      */
      */

-    public function toMail($notifiable)
+    public function toMail(User $notifiable): MailMessage

     {
         $appName = ['appName' => setting('app-name')];
     {
         $appName = ['appName' => setting('app-name')];

+        $language = setting()->getUser($notifiable, 'language');
+

         return $this->newMailMessage()
         return $this->newMailMessage()

-                ->subject(trans('auth.user_invite_email_subject', $appName))
-                ->greeting(trans('auth.user_invite_email_greeting', $appName))
-                ->line(trans('auth.user_invite_email_text'))
-                ->action(trans('auth.user_invite_email_action'), url('/register/invite/' . $this->token));
+                ->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))
+                ->action(trans('auth.user_invite_email_action', [], $language), url('/register/invite/' . $this->token));

     }
 }
     }
 }