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

More consistent monetary formatting.

Browse Source
This commit is contained in:
James Cole 2016-01-10 18:02:24 +01:00
parent 71bb88529a
commit 5a7607f6c6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Controller.php
View File

@ -9,6 +9,7 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use NumberFormatter;
use Preferences; use Preferences;
use View; use View;
@ -21,10 +22,10 @@ class Controller extends BaseController
{ {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
/** @var string|\Symfony\Component\Translation\TranslatorInterface */ /** @var string|\Symfony\Component\Translation\TranslatorInterface */
protected $monthFormat; protected $monthFormat;
/** @var string|\Symfony\Component\Translation\TranslatorInterface */ /** @var string|\Symfony\Component\Translation\TranslatorInterface */
protected $monthAndDayFormat; protected $monthAndDayFormat;
/** /**
@ -51,10 +52,17 @@ class Controller extends BaseController
setlocale(LC_TIME, $locale); setlocale(LC_TIME, $locale);
setlocale(LC_MONETARY, $locale); setlocale(LC_MONETARY, $locale);
// change localeconv to a new array:
$numberFormatter = numfmt_create($lang, NumberFormatter::CURRENCY);
$localeconv = [
'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)),
'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)),
'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS)
];
View::share('monthFormat', $this->monthFormat); View::share('monthFormat', $this->monthFormat);
View::share('monthAndDayFormat', $this->monthAndDayFormat); View::share('monthAndDayFormat', $this->monthAndDayFormat);
View::share('language', $lang); View::share('language', $lang);
View::share('localeconv', localeconv()); View::share('localeconv', $localeconv);
} }
} }