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

Call Yii::t everytime instead of passing a template variable

Browse Source
This commit is contained in:
David Renty
2014-03-12 14:49:28 +01:00
parent fd7ed28221
commit ced45c5450
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/base/Formatter.php
View File

@@ -457,7 +457,7 @@ 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 $value the value to be formatted. The following
* types of value are supported: * types of value are supported:
* *
@@ -482,27 +482,25 @@ class Formatter extends Component
if ($interval->y >= 1) { if ($interval->y >= 1) {
$delta = $interval->y; $delta = $interval->y;
$format = '{delta, plural, =1{a year} other{# years}} ago'; return Yii::t('yii', '{delta, plural, =1{a year} other{# years}} ago', ['delta' => $delta]);
} elseif ($interval->m >= 1) { } elseif ($interval->m >= 1) {
$delta = $interval->m; $delta = $interval->m;
$format = '{delta, plural, =1{a month} other{# months}} ago'; return Yii::t('yii', '{delta, plural, =1{a month} other{# months}} ago', ['delta' => $delta]);
} elseif ($interval->d >= 7) { } elseif ($interval->d >= 7) {
$delta = floor($interval->d / 7); $delta = floor($interval->d / 7);
$format = '{delta, plural, =1{a week} other{# weeks}} ago'; return Yii::t('yii', '{delta, plural, =1{a week} other{# weeks}} ago', ['delta' => $delta]);
} elseif ($interval->d >= 1) { } elseif ($interval->d >= 1) {
$delta = $interval->d; $delta = $interval->d;
$format = '{delta, plural, =1{yesterday} other{# days ago}}'; return Yii::t('yii', '{delta, plural, =1{yesterday} other{# days ago}}', ['delta' => $delta]);
} elseif ($interval->h >= 1) { } elseif ($interval->h >= 1) {
$delta = $interval->h; $delta = $interval->h;
$format = '{delta, plural, =1{an hour} other{# hours}} ago'; return Yii::t('yii', '{delta, plural, =1{an hour} other{# hours}} ago', ['delta' => $delta]);
} elseif ($interval->i >= 1) { } elseif ($interval->i >= 1) {
$delta = $interval->i; $delta = $interval->i;
$format = '{delta, plural, =1{a minute} other{# minutes}} ago'; return Yii::t('yii', '{delta, plural, =1{a minute} other{# minutes}} ago', ['delta' => $delta]);
} else { } else {
$delta = $interval->s; $delta = $interval->s;
$format = '{delta, plural, =1{a second} other{# seconds}} ago'; return Yii::t('yii', '{delta, plural, =1{a second} other{# seconds}} ago', ['delta' => $delta]);
} }
return Yii::t('yii', $format, ['delta' => $delta]);
} }
} }