Merge branch 'master' of https://github.com/bagisto/bagisto into development

packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php

@@ -21,6 +21,7 @@ class CustomerResetPassword extends ResetPassword
         }
 
         return (new MailMessage)
+            ->subject(__('shop::app.mail.forget-password.subject') )
             ->view('shop::emails.customer.forget-password', [
                 'user_name' => $notifiable->name,
                 'token' => $this->token

packages/Webkul/Shop/src/Resources/lang/en/app.php

@@ -509,6 +509,7 @@ return [
             'greeting' => 'An Order :order_id has been placed on :created_at',
         ],
         'forget-password' => [
+            'subject' => 'Customer Reset Password',
             'dear' => 'Dear :name',
             'info' => 'You are receiving this email because we received a password reset request for your account',
             'reset-password' => 'Reset Password',

packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php

@@ -46,7 +46,7 @@
             <div class="control-group" style="margin-bottom: 0px;">
                 <a href="{{ route('customer.session.index') }}">
                     <i class="icon primary-back-icon"></i>
-                    Back to Sign In
+                    {{ __('shop::app.customer.reset-password.back-link-title') }}
                 </a>
             </div>