adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-04-13 01:09:42 -04:30
commit 3fc212fe28
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/tests/cases/libs/view/helpers/time.test.php
View file

@ -661,9 +661,7 @@ class TimeHelperTest extends CakeTestCase {
'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
), true);
Configure::write('Config.language', 'time_test');
$time = 1263487419; // Thu Jan 14 11:43:39 2010
$offset = 5 * 60 * 60;
$time = $time - date('Z') - $offset - (date('I', $time) * 60 * 60);
$time = strtotime('Thu Jan 14 11:43:39 2010');
$result = $this->Time->convertSpecifiers('%a', $time);
$expected = 'jue';
@ -753,9 +751,7 @@ class TimeHelperTest extends CakeTestCase {
'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
), true);
Configure::write('Config.language', 'time_test');
$time = 1263495568; //Thu Jan 14 13:59:28 2010
$offset = 5 * 60 * 60;
$time = $time - date('Z') - $offset - (date('I', $time) * 60 * 60);
$time = strtotime('Thu Jan 14 13:59:28 2010');
$result = $this->Time->i18nFormat($time);
$expected = '14/01/10';