Merge pull request #2809 from nanaya/trans_count_fix

Explicitly set locale when using fallback in trans_choice
ppy · Mar 26, 2018 · 562b1f6 · 562b1f6
2 parents 35b7f48 + fb5a5ea
commit 562b1f6
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/app/framework_helper_overrides.php b/app/framework_helper_overrides.php
@@ -9,3 +9,14 @@ function e($value)
 
     return htmlspecialchars($value, ENT_QUOTES, 'UTF-8', true);
 }
+
+function trans_choice($key, $number, array $replace = [], $locale = null)
+{
+    $translator = app('translator');
+
+    if ($translator->hasForLocale($key, $locale)) {
+        return $translator->transChoice($key, $number, $replace, $locale);
+    } else {
+        return $translator->transChoice($key, $number, $replace, config('app.fallback_locale'));
+    }
+}