jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

daily stats in timesheet (#552)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-13 15:36:59 +01:00
committed by GitHub
parent fd60d5bb17
commit 2c6f57c7ce
13 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Twig/Extensions.php
View File

@@ -41,6 +41,10 @@ class Extensions extends \Twig_Extension
* @var NumberFormatter
*/
protected $numberFormatter;
/**
* @var NumberFormatter
*/
protected $moneyFormatter;
/**
* @var RequestStack
@@ -254,18 +258,15 @@ class Extensions extends \Twig_Extension
if ($this->locale !== $locale) {
$this->locale = $locale;
$this->numberFormatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
$this->numberFormatter = new NumberFormatter($locale, NumberFormatter::DECIMAL);
$this->moneyFormatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
}
$fractionDigits = Intl::getCurrencyBundle()->getFractionDigits($currency);
$amount = round($amount, $fractionDigits);
$result = $this->numberFormatter->format($amount);
if (null !== $currency) {
$result = $this->numberFormatter->formatCurrency($amount, $currency);
return $this->moneyFormatter->formatCurrency($amount, $currency);
}
return $result;
return $this->numberFormatter->format($amount);
}
/**