From 7fa52710f3b1448db286d7335ddffa439818e636 Mon Sep 17 00:00:00 2001 From: AD7six Date: Sat, 19 Mar 2011 18:52:43 +0100 Subject: [PATCH] correct tests to use correct language domains. updated test_app default.ctp and home.ctp to be (almost) identical to the files shipped in the core --- .../tests/cases/libs/cake_socket.test.php | 2 +- lib/Cake/tests/cases/libs/file.test.php | 4 +- .../tests/test_app/views/layouts/default.ctp | 33 ++- lib/Cake/tests/test_app/views/pages/home.ctp | 213 +++++++++++++----- 4 files changed, 179 insertions(+), 73 deletions(-) diff --git a/lib/Cake/tests/cases/libs/cake_socket.test.php b/lib/Cake/tests/cases/libs/cake_socket.test.php index e2bb2a1e1..c4d3318aa 100644 --- a/lib/Cake/tests/cases/libs/cake_socket.test.php +++ b/lib/Cake/tests/cases/libs/cake_socket.test.php @@ -174,7 +174,7 @@ class CakeSocketTest extends CakeTestCase { $this->Socket = new CakeSocket($config); $this->assertTrue($this->Socket->connect()); $this->assertFalse($this->Socket->read(1024 * 1024)); - $this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake', 'Connection timed out')); + $this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_error', 'Connection timed out')); $config = array('host' => 'cakephp.org', 'port' => 80, 'timeout' => 20); $this->Socket = new CakeSocket($config); diff --git a/lib/Cake/tests/cases/libs/file.test.php b/lib/Cake/tests/cases/libs/file.test.php index 3d2eddae2..0cec3bbb6 100644 --- a/lib/Cake/tests/cases/libs/file.test.php +++ b/lib/Cake/tests/cases/libs/file.test.php @@ -482,9 +482,9 @@ class FileTest extends CakeTestCase { $assertLine = $assertLine->traceMethod(); $shortPath = substr($tmpFile, strlen(ROOT)); - $message = __d('cake', '[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine; + $message = __d('cake_developer', '[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine; $this->_reporter->paintSkip($message); } return false; } -} +} \ No newline at end of file diff --git a/lib/Cake/tests/test_app/views/layouts/default.ctp b/lib/Cake/tests/test_app/views/layouts/default.ctp index 9d7ba9871..c2908e44a 100644 --- a/lib/Cake/tests/test_app/views/layouts/default.ctp +++ b/lib/Cake/tests/test_app/views/layouts/default.ctp @@ -11,42 +11,51 @@ * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @package cake.libs.view.templates.pages + * @package cake.libs.view.templates.layouts * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ $this->loadHelper('Html'); + +$cakeDescription = __d('cake_developer', 'CakePHP: the rapid development php framework'); ?> - Html->charset();?> + Html->charset(); ?> - <?php __d('cake', 'CakePHP: the rapid development php framework:'); ?> - <?php echo $title_for_layout;?> + <?php echo $cakeDescription ?>: + <?php echo $title_for_layout; ?> + Html->meta('icon'); - Html->css('cake.generic');?> - + echo $this->Html->css('cake.generic'); + + echo $scripts_for_layout; + ?>
- + Session->flash(); ?> + +
+ element('sql_dump'); ?> \ No newline at end of file diff --git a/lib/Cake/tests/test_app/views/pages/home.ctp b/lib/Cake/tests/test_app/views/pages/home.ctp index 45b264788..3ab519c3f 100644 --- a/lib/Cake/tests/test_app/views/pages/home.ctp +++ b/lib/Cake/tests/test_app/views/pages/home.ctp @@ -1,74 +1,171 @@ -

Sweet, "Test App" got Baked by CakePHP!

-

'; - echo __d('cake', 'Your tmp directory is writable.'); - echo ''; - else: - echo ''; - echo __d('cake', 'Your tmp directory is NOT writable.'); - echo ''; - endif; +/** + * + * PHP 5 + * + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. + * + * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org CakePHP(tm) Project + * @package cake.libs.view.templates.pages + * @since CakePHP(tm) v 0.10.0.1076 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + */ +if (Configure::read('debug') == 0): + throw new NotFoundException(); +endif; +App::uses('Debugger', 'Utility'); ?> +

+ + 0): + Debugger::checkSecurityKeys(); +endif; +?> +

+ '; + echo __d('cake_developer', 'Your tmp directory is writable.'); + echo ''; + else: + echo ''; + echo __d('cake_developer', 'Your tmp directory is NOT writable.'); + echo ''; + endif; + ?>

-'; - echo __d('cake', 'The %s is being used for caching. To change the config edit APP/config/core.php ', ''. $settings['engine'] . 'Engine'); - echo ''; - else: - echo ''; - echo __d('cake', 'Your cache is NOT working. Please check the settings in APP/config/core.php'); - echo ''; - endif; -?> + '; + echo __d('cake_developer', 'The %s is being used for caching. To change the config edit APP/config/core.php ', ''. $settings['engine'] . 'Engine'); + echo ''; + else: + echo ''; + echo __d('cake_developer', 'Your cache is NOT working. Please check the settings in APP/config/core.php'); + echo ''; + endif; + ?>

-'; - echo __d('cake', 'Your database configuration file is present.'); - $filePresent = true; - echo ''; - else: - echo ''; - echo __d('cake', 'Your database configuration file is NOT present.'); - echo '
'; - echo __d('cake', 'Rename config/database.php.default to config/database.php'); - echo ''; - endif; -?> + '; + echo __d('cake_developer', 'Your database configuration file is present.'); + $filePresent = true; + echo ''; + else: + echo ''; + echo __d('cake_developer', 'Your database configuration file is NOT present.'); + echo '
'; + echo __d('cake_developer', 'Rename config/database.php.default to config/database.php'); + echo ''; + endif; + ?>

-'; - echo __d('cake', 'Cake is able to connect to the database.'); - echo ''; - else: - echo ''; - echo __d('cake', 'Cake is NOT able to connect to the database.'); - echo ''; - endif; -?> + isConnected()): + echo ''; + echo __d('cake_developer', 'Cake is able to connect to the database.'); + echo ''; + else: + echo ''; + echo __d('cake_developer', 'Cake is NOT able to connect to the database.'); + echo ''; + endif; + ?>

-

+'; + __('PCRE has not been compiled with Unicode support.'); + echo '
'; + __('Recompile PCRE with Unicode support by adding --enable-unicode-properties when configuring'); + echo '

'; + } +?> +

', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.
', APP . 'webroot' . DS . 'css'); +echo __d('cake_developer', 'To change the content of this page, create: APP/views/pages/home.ctp.
+To change its layout, create: APP/views/layouts/default.ctp.
+You can also add some CSS styles for your pages at: APP/webroot/css.'); ?> -

\ No newline at end of file +

+ +

+

+ Html->link( + sprintf('%s %s', __d('cake_developer', 'New'), __d('cake_developer', 'CakePHP 1.3 Docs')), + 'http://book.cakephp.org/view/875/x1-3-Collection', + array('target' => '_blank', 'escape' => false) + ); + ?> +

+

+ Html->link( + __d('cake_developer', 'The 15 min Blog Tutorial'), + 'http://book.cakephp.org/view/1528/Blog', + array('target' => '_blank', 'escape' => false) + ); + ?> +

+ +

+

+ +

+

+ +

+ + \ No newline at end of file