user trait

src/Illuminate/Mail/Mailable.php

@@ -9,13 +9,16 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\HtmlString;
 use Illuminate\Container\Container;
+use Illuminate\Support\Traits\Localizable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Contracts\Queue\Factory as Queue;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Mail\Mailable as MailableContract;
 
 class Mailable implements MailableContract, Renderable
 {
+    use Localizable;
+
     /**
      * The person the message is from.
      *
@@ -129,27 +132,17 @@ class Mailable implements MailableContract, Renderable
      */
     public function send(MailerContract $mailer)
     {
-        $currentLocale = $mailer->translator ? $mailer->translator->getLocale() : null;
-
-        try {
-            if ($mailer->translator && $this->locale) {
-                $mailer->translator->setLocale($this->locale);
-            }
-
+        $this->withLocale($this->locale, $mailer->translator, function () use ($mailer) {
             Container::getInstance()->call([$this, 'build']);
 
             $mailer->send($this->buildView(), $this->buildViewData(), function ($message) {
                 $this->buildFrom($message)
-                    ->buildRecipients($message)
-                    ->buildSubject($message)
-                    ->runCallbacks($message)
-                    ->buildAttachments($message);
+                     ->buildRecipients($message)
+                     ->buildSubject($message)
+                     ->runCallbacks($message)
+                     ->buildAttachments($message);
             });
-        } finally {
-            if ($mailer->translator) {
-                $mailer->translator->setLocale($currentLocale);
-            }
-        }
+        });
     }
 
     /**

src/Illuminate/Support/Traits/Localizable.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Illuminate\Support\Traits;
+
+trait Localizable
+{
+    /**
+     * Run the callback with the given locale.
+     *
+     * @param  string  $locale
+     * @param  \Illuminate\Contracts\Translation\Translator  $translator
+     * @param  \Closure  $callback
+     * @return bool
+     */
+    public function withLocale($locale, $translator, $callback)
+    {
+        if (! $locale || ! $translator) {
+            return $callback();
+        }
+
+        $original = $translator->getLocale();
+
+        try {
+            $translator->setLocale($locale);
+
+            return $callback();
+        } finally {
+            $translator->setLocale($original);
+        }
+    }
+}