Only check hasForLocale once in localeForChoice

laravel · Jul 31, 2024 · 569ff21 · 569ff21
1 parent 9037a8e
commit 569ff21
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -217,15 +217,9 @@ public function choice($key, $number, array $replace = [], $locale = null)
      */
     protected function localeForChoice($key, $locale)
     {
-        if ($locale && $this->hasForLocale($key, $locale)) {
-            return $locale;
-        }
-
-        if ($this->hasForLocale($key, $this->locale)) {
-            return $this->locale;
-        }
+        $locale = $locale ?: $this->locale;
 
-        return $this->fallback;
+        return $this->hasForLocale($key, $locale) ? $locale : $this->fallback;
     }
 
     /**