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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-07-27 05:03:37 +02:00
parent 0312ba8ad7
commit e3e0e12fef
43 changed files with 167 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Support/Amount.php
View File

@@ -33,6 +33,7 @@ use Preferences as Prefs;
*/
class Amount
{
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* bool $sepBySpace is $localeconv['n_sep_by_space']
* int $signPosn = $localeconv['n_sign_posn']
@@ -116,10 +117,11 @@ class Amount
*
* @return string
*/
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string
{
$locale = explode(',', (string)trans('config.locale'));
$locale = array_map('trim', $locale);
$coloured = $coloured ?? true;
$locale = explode(',', (string)trans('config.locale'));
$locale = array_map('trim', $locale);
setlocale(LC_MONETARY, $locale);
$float = round($amount, 12);
$info = localeconv();
@@ -205,6 +207,7 @@ class Amount
*/
public function getDefaultCurrency(): TransactionCurrency
{
/** @var User $user */
$user = auth()->user();
return $this->getDefaultCurrencyByUser($user);