php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +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

1
framework/CHANGELOG.md
View File

@ -101,6 +101,7 @@ Yii Framework 2 Change Log
-----------------------
- Bug #7670: Added `yii\web\UrlNormalizer` for normalizing requests with and without trailing slashes (rob006, cronfy, klimov-paul)
- Bug #12345 Fixed `Formatter::asCurrency()` for proper decimal formatting (Oxyaction)
- Bug #7670: Added `UrlNormalizer` for normalizing requests with and without trailing slashes (rob006, cronfy, klimov-paul)
- Bug #9027: Fixed descendant class of `yii\web\UploadedFile` returns parent instances in case invoked after it (andrewnester)
- Bug #9277: Fixed `yii\console\controllers\AssetController` looses custom options of 'target' bundles (petrabarus, klimov-paul)

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;

9
tests/framework/i18n/FormatterNumberTest.php
View File

@ -305,6 +305,15 @@ class FormatterNumberTest extends TestCase
$this->assertSame("0,00 €", $this->formatter->asCurrency(false));
$this->assertSame("0,00 €", $this->formatter->asCurrency(""));
// decimal formatting
$this->formatter->locale = 'de-DE';
$this->assertSame("100 $", \Yii::$app->formatter->asCurrency(100, 'USD', [
NumberFormatter::MAX_FRACTION_DIGITS => 0,
]));
$this->assertSame("100,00 $", $this->formatter->asCurrency(100, 'USD', [
NumberFormatter::MAX_FRACTION_DIGITS => 2
]));
// null display
$this->assertSame($this->formatter->nullDisplay, $this->formatter->asCurrency(null));
}