IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add locale to variables.

Browse Source
This commit is contained in:
James Cole 2020-07-27 20:06:18 +02:00
parent d49743031f
commit 1c07feb446
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/JavascriptController.php
View File

@ -136,7 +136,7 @@ class JavascriptController extends Controller
if(null !== $account) { if(null !== $account) {
$currency = $repository->getAccountCurrency($account) ?? $currency; $currency = $repository->getAccountCurrency($account) ?? $currency;
} }
$locale = app('steam')->getLocale();
$accounting = app('amount')->getJsConfig(); $accounting = app('amount')->getJsConfig();
$accounting['frac_digits'] = $currency->decimal_places; $accounting['frac_digits'] = $currency->decimal_places;
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US')); $pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
@ -146,13 +146,14 @@ class JavascriptController extends Controller
$uid = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12); $uid = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
$data = [ $data = [
'currencyCode' => $currency->code, 'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol, 'currencySymbol' => $currency->symbol,
'accountingLocaleInfo' => $accounting, 'accountingLocaleInfo' => $accounting,
'language' => $lang, 'language' => $lang,
'dateRangeTitle' => $dateRange['title'], 'dateRangeTitle' => $dateRange['title'],
'dateRangeConfig' => $dateRange['configuration'], 'locale' => $locale,
'uid' => $uid, 'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
]; ];
$request->session()->keep(['two-factor-secret']); $request->session()->keep(['two-factor-secret']);