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

asElapsedTime can now take DateInterval as parameter

Browse Source
This commit is contained in:
David Renty
2014-03-12 15:57:20 +01:00
parent a74fa20d2d
commit f7871e2458
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
framework/base/Formatter.php
View File

@ -458,49 +458,59 @@ class Formatter extends Component
/** /**
* Formats the value as the time elapsed since then in human readable form. * Formats the value as the time elapsed since then in human readable form.
* @param integer|string|DateTime $value the value to be formatted. The following * @param integer|string|DateTime|DateInterval $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
* - an integer representing a 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
* - a PHP DateInterval object
* *
* @return string the formatted result * @return string the formatted result
*/ */
public function asElapsedTime($value) public function asElapsedTime($value)
{ {
if ($value === null) { if ($value instanceof \DateInterval) {
return $this->nullDisplay; $interval = $value;
} else {
if ($value === null) {
return $this->nullDisplay;
}
$value = $this->normalizeDatetimeValue($value);
$dateNow = new DateTime('now', new \DateTimeZone($this->timeZone));
$dateThen = new DateTime(null, new \DateTimeZone($this->timeZone));
$dateThen->setTimestamp($value);
$interval = $dateNow->diff($dateThen);
} }
$value = $this->normalizeDatetimeValue($value);
$now = new \DateTime();
$date = new DateTime(null, new \DateTimeZone($this->timeZone));
$date->setTimestamp($value);
$interval = $now->diff($date);
if ($interval->y >= 1) { if ($interval->y >= 1) {
$delta = $interval->y; $delta = $interval->y;
return Yii::t('yii', '{delta, plural, =1{a year} other{# years}} ago', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{a year} other{# years}} ago', ['delta' => $delta]);
} elseif ($interval->m >= 1) { }
if ($interval->m >= 1) {
$delta = $interval->m; $delta = $interval->m;
return Yii::t('yii', '{delta, plural, =1{a month} other{# months}} ago', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{a month} other{# months}} ago', ['delta' => $delta]);
} elseif ($interval->d >= 7) { }
if ($interval->d >= 7) {
$delta = floor($interval->d / 7); $delta = floor($interval->d / 7);
return Yii::t('yii', '{delta, plural, =1{a week} other{# weeks}} ago', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{a week} other{# weeks}} ago', ['delta' => $delta]);
} elseif ($interval->d >= 1) { }
if ($interval->d >= 1) {
$delta = $interval->d; $delta = $interval->d;
return Yii::t('yii', '{delta, plural, =1{yesterday} other{# days ago}}', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{yesterday} other{# days ago}}', ['delta' => $delta]);
} elseif ($interval->h >= 1) { }
if ($interval->h >= 1) {
$delta = $interval->h; $delta = $interval->h;
return Yii::t('yii', '{delta, plural, =1{an hour} other{# hours}} ago', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{an hour} other{# hours}} ago', ['delta' => $delta]);
} elseif ($interval->i >= 1) { }
if ($interval->i >= 1) {
$delta = $interval->i; $delta = $interval->i;
return Yii::t('yii', '{delta, plural, =1{a minute} other{# minutes}} ago', ['delta' => $delta]); return Yii::t('yii', '{delta, plural, =1{a minute} other{# minutes}} ago', ['delta' => $delta]);
} else {
$delta = $interval->s;
return Yii::t('yii', '{delta, plural, =1{a second} other{# seconds}} ago', ['delta' => $delta]);
} }
$delta = $interval->s;
return Yii::t('yii', '{delta, plural, =1{a second} other{# seconds}} ago', ['delta' => $delta]);
} }
} }