Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
2553e9a043 07011a2542
commit
01c20996a6
2 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      framework/yii/base/Formatter.php
  2. 6
      framework/yii/i18n/Formatter.php

12
framework/yii/base/Formatter.php
Unescape 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
Unescape 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
* *

Write Preview
Loading…
Cancel
Save