Upgrade to 3.2.5

This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions

View File

@@ -16,7 +16,6 @@ use Exception;
*/
class I18n
{
/**
* Custom loader function
*
@@ -116,7 +115,7 @@ class I18n
return $key[$locale];
}
if (is_array($fallback)) {
return $fallback[$locale] ?? null;
return $fallback[$locale] ?? $fallback['en'] ?? reset($fallback);
}
return $fallback;
}
@@ -196,6 +195,7 @@ class I18n
*
* @param string $key
* @param integer $count
* @param string $locale
* @return mixed
*/
public static function translateCount(string $key, int $count, string $locale = null)