interkollektives/lichterei-web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.6.1

Browse Source
This commit is contained in:
Bastian Allgeier
2021-12-07 12:39:37 +01:00
parent 9fc43ea22c
commit 70b8439c49
134 changed files with 19987 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kirby/src/Toolkit/I18n.php
View File

@@ -115,7 +115,7 @@ class I18n
*/
public static function formatNumber($number, string $locale = null): string
{
$locale = $locale ?? static::locale();
$locale ??= static::locale();
$formatter = static::decimalNumberFormatter($locale);
if ($formatter !== null) {
@@ -154,7 +154,7 @@ class I18n
*/
public static function translate($key, $fallback = null, string $locale = null)
{
$locale = $locale ?? static::locale();
$locale ??= static::locale();
if (is_array($key) === true) {
if (isset($key[$locale])) {
@@ -224,7 +224,7 @@ class I18n
*/
public static function translation(string $locale = null): array
{
$locale = $locale ?? static::locale();
$locale ??= static::locale();
if (isset(static::$translations[$locale]) === true) {
return static::$translations[$locale];
@@ -283,8 +283,7 @@ class I18n
*/
public static function translateCount(string $key, int $count, string $locale = null, bool $formatNumber = true)
{
$locale = $locale ?? static::locale();
$locale ??= static::locale();
$translation = static::translate($key, null, $locale);
if ($translation === null) {