kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 20:22:07 +00:00
Code Issues Projects Releases Wiki Activity

Restore locale info from localeconv #3578

Browse Source
This commit is contained in:
James Cole
2020-07-27 07:05:41 +02:00
parent 9c14bc24e2
commit c5489a7c55
2 changed files with 137 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,8 +144,9 @@ class JavascriptController extends Controller
$currency = app('amount')->getDefaultCurrency();
}
$accountingLocaleInfo = app('amount')->getAccountingLocaleInfo();
$accountingLocaleInfo['frac_digits'] = $currency->decimal_places;
$localeconv = app('amount')->getLocaleInfo();
$accounting = app('amount')->getJsConfig($localeconv);
$accounting['frac_digits'] = $currency->decimal_places;
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
/** @noinspection NullPointerExceptionInspection */
$lang = $pref->data;
@@ -155,7 +156,7 @@ class JavascriptController extends Controller
$data = [
'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol,
'accountingLocaleInfo' => $accountingLocaleInfo,
'accountingLocaleInfo' => $accounting,
'language' => $lang,
'dateRangeTitle' => $dateRange['title'],
'dateRangeConfig' => $dateRange['configuration'],