Merge pull request #312 from mikemand/feature/email-subjects-translatable

Allow user Welcome and Password Reset email subjects to be translated

Modules/Translation/Resources/lang/user/en/messages.php

@@ -11,6 +11,9 @@ return [
     'user no longer exists' => 'The user no longer exists.',
     'invalid reset code' => 'Invalid or expired reset code.',
     'password reset' => 'Password has been reset. You can now login with your new password.',
+    /* Email subjects */
+    'welcome' => 'Welcome.',
+    'reset password' => 'Reset your account password.',
     /* User management */
     'user created' => 'User successfully created.',
     'user not found' => 'User not found.',

Modules/User/Emails/ResetPasswordEmail.php

@@ -16,11 +16,11 @@ class ResetPasswordEmail extends Mailable implements ShouldQueue
      * @var UserInterface
      */
     public $user;
+
     /**
      * @var
      */
     public $code;
-    protected $subject = 'Reset your account password.';
 
     public function __construct(UserInterface $user, $code)
     {
@@ -35,6 +35,7 @@ class ResetPasswordEmail extends Mailable implements ShouldQueue
      */
     public function build()
     {
-        return $this->view('user::emails.reminder');
+        return $this->view('user::emails.reminder')
+            ->subject(trans('user::messages.reset password'));
     }
 }

Modules/User/Emails/WelcomeEmail.php

@@ -16,13 +16,12 @@ class WelcomeEmail extends Mailable implements ShouldQueue
      * @var UserInterface
      */
     public $user;
+
     /**
      * @var
      */
     public $activationCode;
 
-    protected $subject = 'Welcome.';
-
     public function __construct(UserInterface $user, $activationCode)
     {
         $this->user = $user;
@@ -36,6 +35,7 @@ class WelcomeEmail extends Mailable implements ShouldQueue
      */
     public function build()
     {
-        return $this->view('user::emails.welcome');
+        return $this->view('user::emails.welcome')
+            ->subject(trans('user::messages.welcome'));
     }
 }