Mailable render() respects locale

In production, this allows:

(new Mailable)->locale('es')->render()

Author: Derek MacDonald

src/Illuminate/Mail/Mailable.php

@@ -208,11 +208,13 @@ public function later($delay, Queue $queue)
      */
     public function render()
     {
-        Container::getInstance()->call([$this, 'build']);
+        return $this->withLocale($this->locale, function () {
+            Container::getInstance()->call([$this, 'build']);
 
-        return Container::getInstance()->make('mailer')->render(
-            $this->buildView(), $this->buildViewData()
-        );
+            return Container::getInstance()->make('mailer')->render(
+                $this->buildView(), $this->buildViewData()
+            );
+        });
     }
 
     /**

tests/Integration/Mail/RenderingMailWithLocaleTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Mail;
+
+use Illuminate\Mail\Mailable;
+use Orchestra\Testbench\TestCase;
+use Illuminate\Support\Facades\View;
+
+/**
+ * @group integration
+ */
+class RenderingMailWithLocaleTest extends TestCase
+{
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('app.locale', 'en');
+
+        View::addLocation(__DIR__.'/Fixtures');
+
+        app('translator')->setLoaded([
+            '*' => [
+                '*' => [
+                    'en' => ['nom' => 'name'],
+                    'es' => ['nom' => 'nombre'],
+                ],
+            ],
+        ]);
+    }
+
+    public function testMailableRendersInDefaultLocale()
+    {
+        $mail = new RenderedTestMail;
+
+        $this->assertEquals("name\n", $mail->render());
+    }
+
+    public function testMailableRendersInSelectedLocale()
+    {
+        $mail = (new RenderedTestMail)->locale('es');
+
+        $this->assertEquals("nombre\n", $mail->render());
+    }
+}
+
+class RenderedTestMail extends Mailable
+{
+    public function build()
+    {
+        return $this->view('view');
+    }
+}