github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 06:14:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only attempt to get default locale if db is up to date

Browse Source
This commit is contained in:
Toby Zerner 2015-10-31 18:21:39 +10:30
parent 953f81176b
commit b44ffd9f8d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Locale/LocaleServiceProvider.php
View File

@ -37,7 +37,9 @@ class LocaleServiceProvider extends AbstractServiceProvider
$this->app->alias('Flarum\Locale\LocaleManager', 'flarum.localeManager'); $this->app->alias('Flarum\Locale\LocaleManager', 'flarum.localeManager');
$this->app->singleton('translator', function () { $this->app->singleton('translator', function () {
$defaultLocale = $this->app->isInstalled() ? $this->app->make('flarum.settings')->get('default_locale') : 'en'; $defaultLocale = $this->app->isInstalled() && $this->app->isUpToDate()
? $this->app->make('flarum.settings')->get('default_locale', 'en')
: 'en';
$translator = new Translator($defaultLocale, new MessageSelector()); $translator = new Translator($defaultLocale, new MessageSelector());
$translator->setFallbackLocales([$defaultLocale]); $translator->setFallbackLocales([$defaultLocale]);