[5.7] Mailables can hook into LocaleUpdated

src/Illuminate/Mail/Mailable.php

@@ -12,7 +12,6 @@
 use Illuminate\Support\Traits\Localizable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Contracts\Queue\Factory as Queue;
-use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Mail\Mailable as MailableContract;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
@@ -134,9 +133,7 @@ class Mailable implements MailableContract, Renderable
      */
     public function send(MailerContract $mailer)
     {
-        $translator = Container::getInstance()->make(Translator::class);
-
-        $this->withLocale($this->locale, $translator, function () use ($mailer) {
+        $this->withLocale($this->locale, function () use ($mailer) {
             Container::getInstance()->call([$this, 'build']);
 
             $mailer->send($this->buildView(), $this->buildViewData(), function ($message) {

src/Illuminate/Support/Traits/Localizable.php

@@ -2,30 +2,33 @@
 
 namespace Illuminate\Support\Traits;
 
+use Illuminate\Container\Container;
+
 trait Localizable
 {
     /**
      * Run the callback with the given locale.
      *
-     * @param  string  $locale
-     * @param  \Illuminate\Contracts\Translation\Translator  $translator
-     * @param  \Closure  $callback
+     * @param  string   $locale
+     * @param  \Closure $callback
      * @return bool
      */
-    public function withLocale($locale, $translator, $callback)
+    public function withLocale($locale, $callback)
     {
-        if (! $locale || ! $translator) {
+        if (! $locale) {
             return $callback();
         }
 
-        $original = $translator->getLocale();
+        $app = Container::getInstance();
+
+        $original = $app->getLocale();
 
         try {
-            $translator->setLocale($locale);
+            $app->setLocale($locale);
 
             return $callback();
         } finally {
-            $translator->setLocale($original);
+            $app->setLocale($original);
         }
     }
 }

tests/Integration/Mail/Fixtures/timestamp.blade.php

@@ -0,0 +1 @@
+{{__('nom')}} {{ Illuminate\Support\Carbon::tomorrow()->diffForHumans() }}

tests/Integration/Mail/SendingMailWithLocaleTest.php

@@ -4,9 +4,12 @@
 
 use Mockery;
 use Illuminate\Mail\Mailable;
+use Illuminate\Support\Carbon;
 use Orchestra\Testbench\TestCase;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Foundation\Events\LocaleUpdated;
 
 /**
  * @group integration
@@ -35,6 +38,7 @@ protected function getEnvironmentSetUp($app)
                 '*' => [
                     'en' => ['nom' => 'name'],
                     'ar' => ['nom' => 'esm'],
+                    'es' => ['nom' => 'nombre'],
                 ],
             ],
         ]);
@@ -63,6 +67,23 @@ public function test_mail_is_sent_with_selected_locale()
         );
     }
 
+    public function test_mail_is_sent_with_locale_updated_listeners_called()
+    {
+        Carbon::setTestNow(Carbon::parse('2018-04-01'));
+
+        Event::listen(LocaleUpdated::class, function ($event) {
+            Carbon::setLocale($event->locale);
+        });
+
+        Mail::to('[email protected]')->locale('es')->send(new TimestampTestMail);
+
+        $this->assertContains('nombre dentro de 1 día',
+            app('swift.transport')->messages()[0]->getBody()
+        );
+
+        $this->assertEquals('en', Carbon::getLocale());
+    }
+
     public function test_locale_is_set_back_to_default_after_mail_sent()
     {
         Mail::to('[email protected]')->locale('ar')->send(new TestMail());
@@ -92,3 +113,16 @@ public function build()
         return $this->view('view');
     }
 }
+
+class TimestampTestMail extends Mailable
+{
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->view('timestamp');
+    }
+}