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

do not override config when intl is not installed

Browse Source 
fixes #5260
This commit is contained in:
Carsten Brandt
2014-10-01 00:46:28 +02:00
parent a9e91efe8f
commit 0818c9bbfc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.0 under development 2.0.0 under development
----------------------- -----------------------
- Bug #5260: `yii\i18n\Formatter::decimalSeparator` and `yii\i18n\Formatter::thousandSeparator` where not configurable when intl is not installed (execut, cebe)
- Bug: Date and time formatting now assumes UTC as the timezone for input dates unless a timezone is explicitly given (cebe) - Bug: Date and time formatting now assumes UTC as the timezone for input dates unless a timezone is explicitly given (cebe)
- Enh #4275: Added `removeChildren()` to `yii\rbac\ManagerInterface` and implementations (samdark) - Enh #4275: Added `removeChildren()` to `yii\rbac\ManagerInterface` and implementations (samdark)

4
framework/i18n/Formatter.php
View File

@@ -208,10 +208,14 @@ class Formatter extends Component
} }
$this->_intlLoaded = extension_loaded('intl'); $this->_intlLoaded = extension_loaded('intl');
if (!$this->_intlLoaded) { if (!$this->_intlLoaded) {
if ($this->decimalSeparator === null) {
$this->decimalSeparator = '.'; $this->decimalSeparator = '.';
}
if ($this->thousandSeparator === null) {
$this->thousandSeparator = ','; $this->thousandSeparator = ',';
} }
} }
}
/** /**
* Formats the value based on the given format type. * Formats the value based on the given format type.