diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php index 318a42458..3e80dc0a8 100644 --- a/lib/Cake/TestSuite/CakeTestCase.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -184,7 +184,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase { */ function loadFixtures() { if (empty($this->fixtureManager)) { - throw new Exception(__('No fixture manager to load the test fixture')); + throw new Exception(__d('cake', 'No fixture manager to load the test fixture')); } $args = func_get_args(); foreach ($args as $class) { diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php index c0eea1b56..21515886e 100644 --- a/lib/Cake/TestSuite/CakeTestRunner.php +++ b/lib/Cake/TestSuite/CakeTestRunner.php @@ -84,7 +84,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner { if (class_exists($arguments['fixtureManager'])) { return new $arguments['fixtureManager']; } - throw new RuntimeException(__('Could not find fixture manager %s.', $arguments['fixtureManager'])); + throw new RuntimeException(__d('cake', 'Could not find fixture manager %s.', $arguments['fixtureManager'])); } App::uses('AppFixtureManager', 'TestSuite'); if (class_exists('AppFixtureManager')) { diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index 7f2b307f0..ababd8629 100644 --- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -239,7 +239,7 @@ class CakeFixtureManager { $fixture->truncate($db); $fixture->insert($db); } else { - throw new UnexpectedValueException(__('Referenced fixture class %s not found', $name)); + throw new UnexpectedValueException(__d('cake', 'Referenced fixture class %s not found', $name)); } } diff --git a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php index 8e48065c2..b79bd0d52 100644 --- a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php @@ -187,7 +187,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo __('Running %s', $suite->getName()) . "\n"; + echo __d('cake', 'Running %s', $suite->getName()) . "\n"; } /** diff --git a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php old mode 100755 new mode 100644 index e676c570d..d709a7c77 --- a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php @@ -234,8 +234,8 @@ class CakeHtmlReporter extends CakeBaseReporter { echo "
  • \n"; echo "Failed"; echo "
    " . $this->_htmlEntities($message->toString()) . "
    \n"; - echo "
    " . __('Test case: %s', $testName) . "
    \n"; - echo "
    " . __('Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "
  • \n"; } @@ -272,8 +272,8 @@ class CakeHtmlReporter extends CakeBaseReporter { echo "" . get_class($message) . ""; echo "
    " . $this->_htmlEntities($message->getMessage()) . "
    \n"; - echo "
    " . __('Test case: %s', $testName) . "
    \n"; - echo "
    " . __('Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "\n"; } @@ -341,6 +341,6 @@ class CakeHtmlReporter extends CakeBaseReporter { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo '

    ' . __('Running %s', $suite->getName()) . '

    '; + echo '

    ' . __d('cake', 'Running %s', $suite->getName()) . '

    '; } }