adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code formatting, fixes PHPCS errors

Browse source
This commit is contained in:
Schlaefer 2014-10-01 11:25:24 +02:00
parent 388e412a82
commit fd2dd58360
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -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'),

12
lib/Cake/Utility/CakeTime.php
View file

@ -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);