diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index ab493681e..a76ffb6b0 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -279,7 +279,7 @@ class CakeTimeTest extends CakeTestCase { $this->assertEquals('on 2007-09-25', $result); $result = $this->Time->timeAgoInWords('2007-9-25', '%x'); - $this->assertEquals('on '. strftime('%x', strtotime('2007-9-25')), $result); + $this->assertEquals('on ' . strftime('%x', strtotime('2007-9-25')), $result); $result = $this->Time->timeAgoInWords( strtotime('+2 weeks +2 days'), diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php index 9d91981c8..ef924b23d 100644 --- a/lib/Cake/Utility/CakeTime.php +++ b/lib/Cake/Utility/CakeTime.php @@ -896,22 +896,22 @@ class CakeTime { $relativeDate[] = __dn('cake', '%d year', '%d years', $years, $years); } if ($accuracyNum >= 2 && $months > 0) { - $relativeDate[] = __dn('cake', '%d month', '%d months', $months, $months); + $relativeDate[] = __dn('cake', '%d month', '%d months', $months, $months); } if ($accuracyNum >= 3 && $weeks > 0) { - $relativeDate[] = __dn('cake', '%d week', '%d weeks', $weeks, $weeks); + $relativeDate[] = __dn('cake', '%d week', '%d weeks', $weeks, $weeks); } if ($accuracyNum >= 4 && $days > 0) { - $relativeDate[] = __dn('cake', '%d day', '%d days', $days, $days); + $relativeDate[] = __dn('cake', '%d day', '%d days', $days, $days); } if ($accuracyNum >= 5 && $hours > 0) { - $relativeDate[] = __dn('cake', '%d hour', '%d hours', $hours, $hours); + $relativeDate[] = __dn('cake', '%d hour', '%d hours', $hours, $hours); } if ($accuracyNum >= 6 && $minutes > 0) { - $relativeDate[] = __dn('cake', '%d minute', '%d minutes', $minutes, $minutes); + $relativeDate[] = __dn('cake', '%d minute', '%d minutes', $minutes, $minutes); } if ($accuracyNum >= 7 && $seconds > 0) { - $relativeDate[] = __dn('cake', '%d second', '%d seconds', $seconds, $seconds); + $relativeDate[] = __dn('cake', '%d second', '%d seconds', $seconds, $seconds); } $relativeDate = implode(', ', $relativeDate);