set locale conditionally

Author: taylorotwell

src/Illuminate/Mail/PendingMail.php

@@ -175,9 +175,12 @@ public function later($delay, MailableContract $mailable)
      */
     protected function fill(MailableContract $mailable)
     {
-        return $mailable->to($this->to)
-                        ->cc($this->cc)
-                        ->bcc($this->bcc)
-                        ->locale($this->locale);
+        return tap($mailable->to($this->to)
+            ->cc($this->cc)
+            ->bcc($this->bcc), function ($mailable) {
+                if ($this->locale) {
+                    $mailable->locale($this->locale);
+                }
+        });
     }
 }

tests/Integration/Mail/SendingMailWithLocaleTest.php

@@ -69,6 +69,18 @@ public function testMailIsSentWithSelectedLocale()
         );
     }
 
+    public function testMailIsSentWithLocaleFromMailable()
+    {
+        $mailable = new TestMail();
+        $mailable->locale('ar');
+
+        Mail::to('[email protected]')->send($mailable);
+
+        $this->assertStringContainsString('esm',
+            app('swift.transport')->messages()[0]->getBody()
+        );
+    }
+
     public function testMailIsSentWithLocaleUpdatedListenersCalled()
     {
         Carbon::setTestNow('2018-04-01');