mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-29 20:50:28 +02:00
Code Issues Releases Wiki Activity

Fallback to English if system-wide default_locale doesn't exist

Browse Source
This commit is contained in:
Toby Zerner
2015-09-04 22:19:28 +09:30
parent d549e26a4b
commit aa9e867f77
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Support/ClientAction.php
View File

@@ -248,7 +248,11 @@ abstract class ClientAction extends HtmlAction
} }
if (! $locale || ! $this->locales->hasLocale($locale)) { if (! $locale || ! $this->locales->hasLocale($locale)) {
return $this->settings->get('default_locale', 'en'); $locale = $this->settings->get('default_locale', 'en');
}
if (! $this->locales->hasLocale($locale)) {
return 'en';
} }
return $locale; return $locale;