kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3578 from hoshsadiq/feature/use-intl-formatter

Browse Source 
Use php-intl to format currencies
This commit is contained in:
James Cole
2020-07-19 18:05:25 +00:00
committed by GitHub
parent edf6ece7cb 14dd185717
commit 7f3168cc55
6 changed files with 119 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,9 +144,8 @@ class JavascriptController extends Controller
$currency = app('amount')->getDefaultCurrency();
}
$localeconv = app('amount')->getLocaleInfo();
$accounting = app('amount')->getJsConfig($localeconv);
$localeconv['frac_digits'] = $currency->decimal_places;
$accountingLocaleInfo = app('amount')->getAccountingLocaleInfo();
$accountingLocaleInfo['frac_digits'] = $currency->decimal_places;
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
/** @noinspection NullPointerExceptionInspection */
$lang = $pref->data;
@@ -154,14 +153,13 @@ class JavascriptController extends Controller
$uid = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
$data = [
'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol,
'accounting' => $accounting,
'localeconv' => $localeconv,
'language' => $lang,
'dateRangeTitle' => $dateRange['title'],
'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol,
'accountingLocaleInfo' => $accountingLocaleInfo,
'language' => $lang,
'dateRangeTitle' => $dateRange['title'],
'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
];
$request->session()->keep(['two-factor-secret']);