php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 13:02:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed currency format with custom decimal fraction

Browse Source 
fixes #12345
close #12648
This commit is contained in:
a.kompaniets
2016-10-02 01:48:13 +03:00
committed by Carsten Brandt
parent a51dadc866
commit 50f3012f68
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/i18n/Formatter.php
View File

@ -1055,17 +1055,19 @@ class Formatter extends Component
$value = $this->normalizeNumericValue($value);
if ($this->_intlLoaded) {
$currency = $currency ?: $this->currencyCode;
// currency code must be set before fraction digits
// http://php.net/manual/en/numberformatter.formatcurrency.php#114376
if ($currency && !isset($textOptions[NumberFormatter::CURRENCY_CODE])) {
$textOptions[NumberFormatter::CURRENCY_CODE] = $currency;
}
$formatter = $this->createNumberFormatter(NumberFormatter::CURRENCY, null, $options, $textOptions);
if ($currency === null) {
if ($this->currencyCode === null) {
if (($result = $formatter->format($value)) === false) {
throw new InvalidParamException('Formatting currency value failed: ' . $formatter->getErrorCode() . ' ' . $formatter->getErrorMessage());
}
return $result;
}
$currency = $this->currencyCode;
$result = $formatter->format($value);
} else {
$result = $formatter->formatCurrency($value, $currency);
}
if (($result = $formatter->formatCurrency($value, $currency)) === false) {
if ($result === false) {
throw new InvalidParamException('Formatting currency value failed: ' . $formatter->getErrorCode() . ' ' . $formatter->getErrorMessage());
}
return $result;