[5.2] Translation - simplifies the parseLocale() method (#13244)

laravel · Apr 21, 2016 · 0d356a6 · 0d356a6
1 parent 934c915
commit 0d356a6
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -303,11 +303,7 @@ public function parseKey($key)
      */
     protected function parseLocale($locale)
     {
-        if (! is_null($locale)) {
-            return array_filter([$locale, $this->fallback]);
-        }
-
-        return array_filter([$this->locale, $this->fallback]);
+        return array_filter([$locale ?: $this->locale, $this->fallback]);
     }
 
     /**