IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
1 changed files with 8 additions and 5 deletions
Show Stats 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 Closure;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use Illuminate\Http\Request;
/**
@ -33,6 +34,7 @@ use Illuminate\Http\Request;
*/
class Range
{
use RequestInformation;
/**
* Handle an incoming request.
*
@ -72,11 +74,12 @@ class Range
*/
private function configureView(): void
{
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
/** @noinspection NullPointerExceptionInspection */
$lang = $pref->data;
App::setLocale($lang);
Carbon::setLocale(substr($lang, 0, 2));
// get locale preference:
$language = app('steam')->getLanguage();
//$locale = $this->getLocale();
App::setLocale($language);
Carbon::setLocale(substr($language, 0, 2));
$locale = explode(',', (string) trans('config.locale'));
$locale = array_map('trim', $locale);