kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Clean up language setting.

Browse Source
This commit is contained in:
James Cole
2020-04-19 06:11:49 +02:00
parent e58a5e12d6
commit aa786eaaf3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Middleware/Range.php
View File

@@ -26,6 +26,7 @@ use App;
use Carbon\Carbon; use Carbon\Carbon;
use Closure; use Closure;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** /**
@@ -33,6 +34,7 @@ use Illuminate\Http\Request;
*/ */
class Range class Range
{ {
use RequestInformation;
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
@@ -72,11 +74,12 @@ class Range
*/ */
private function configureView(): void private function configureView(): void
{ {
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US')); // get locale preference:
/** @noinspection NullPointerExceptionInspection */ $language = app('steam')->getLanguage();
$lang = $pref->data; //$locale = $this->getLocale();
App::setLocale($lang); App::setLocale($language);
Carbon::setLocale(substr($lang, 0, 2)); Carbon::setLocale(substr($language, 0, 2));
$locale = explode(',', (string) trans('config.locale')); $locale = explode(',', (string) trans('config.locale'));
$locale = array_map('trim', $locale); $locale = array_map('trim', $locale);