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

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2013-05-28 19:56:26 -04:00
parent 2553e9a043 07011a2542
commit 01c20996a6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/base/Formatter.php
View File

@@ -162,12 +162,12 @@ class Formatter extends Component
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *
* @param string $format the format used to convert the value into a date string. * @param string $format the format used to convert the value into a date string.
* If null, [[dateFormat]] will be used. The format string should be the one * If null, [[dateFormat]] will be used. The format string should be one
* that can be recognized by the PHP `date()` function. * that can be recognized by the PHP `date()` function.
* @return string the formatted result * @return string the formatted result
* @see dateFormat * @see dateFormat
@@ -183,12 +183,12 @@ class Formatter extends Component
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *
* @param string $format the format used to convert the value into a date string. * @param string $format the format used to convert the value into a date string.
* If null, [[timeFormat]] will be used. The format string should be the one * If null, [[timeFormat]] will be used. The format string should be one
* that can be recognized by the PHP `date()` function. * that can be recognized by the PHP `date()` function.
* @return string the formatted result * @return string the formatted result
* @see timeFormat * @see timeFormat
@@ -204,12 +204,12 @@ class Formatter extends Component
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *
* @param string $format the format used to convert the value into a date string. * @param string $format the format used to convert the value into a date string.
* If null, [[datetimeFormat]] will be used. The format string should be the one * If null, [[datetimeFormat]] will be used. The format string should be one
* that can be recognized by the PHP `date()` function. * that can be recognized by the PHP `date()` function.
* @return string the formatted result * @return string the formatted result
* @see datetimeFormat * @see datetimeFormat

6
framework/yii/i18n/Formatter.php
View File

@@ -76,7 +76,7 @@ class Formatter extends \yii\base\Formatter
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *
@@ -106,7 +106,7 @@ class Formatter extends \yii\base\Formatter
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *
@@ -136,7 +136,7 @@ class Formatter extends \yii\base\Formatter
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing UNIX timestamp * - an integer representing a UNIX timestamp
* - a string that can be parsed into a UNIX timestamp via `strtotime()` * - a string that can be parsed into a UNIX timestamp via `strtotime()`
* - a PHP DateTime object * - a PHP DateTime object
* *