use the domain cake_developer and cake_error as appropriate

cakephp · Mar 19, 2011 · 5725a23 · 5725a23
1 parent 2078dbc
commit 5725a23
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php
@@ -184,7 +184,7 @@ protected function assertPostConditions() {
  */
 	function loadFixtures() {
 		if (empty($this->fixtureManager)) {
-			throw new Exception(__d('cake', 'No fixture manager to load the test fixture'));
+			throw new Exception(__d('cake_error', '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
@@ -84,7 +84,7 @@ protected function _getFixtureManager($arguments) {
 			if (class_exists($arguments['fixtureManager'])) {
 				return new $arguments['fixtureManager'];
 			}
-			throw new RuntimeException(__d('cake', 'Could not find fixture manager %s.', $arguments['fixtureManager']));
+			throw new RuntimeException(__d('cake_error', '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
@@ -239,7 +239,7 @@ public function loadSingle($name, $db = null) {
 			$fixture->truncate($db);
 			$fixture->insert($db);
 		} else {
-			throw new UnexpectedValueException(__d('cake', 'Referenced fixture class %s not found', $name));
+			throw new UnexpectedValueException(__d('cake_error', 'Referenced fixture class %s not found', $name));
 		}
 	}
 

diff --git a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
@@ -187,7 +187,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
 		if (!$this->_headerSent) {
 			echo $this->paintHeader();
 		}
-		echo __d('cake', 'Running  %s', $suite->getName()) . "\n";
+		echo __d('cake_developer', 'Running  %s', $suite->getName()) . "\n";
 	}
 
 /**
@@ -217,4 +217,4 @@ public function endTest(PHPUnit_Framework_Test $test, $time) {
 		$this->paintPass($test, $time);
 	}
 
-}
+}
diff --git a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
@@ -234,8 +234,8 @@ public function paintFail($message, $test) {
 		echo "<li class='fail'>\n";
 		echo "<span>Failed</span>";
 		echo "<div class='msg'><pre>" . $this->_htmlEntities($message->toString()) . "</pre></div>\n";
-		echo "<div class='msg'>" . __d('cake', 'Test case: %s', $testName) . "</div>\n";
-		echo "<div class='msg'>" . __d('cake', 'Stack trace:') . '<br />' . $trace . "</div>\n";
+		echo "<div class='msg'>" . __d('cake_developer', 'Test case: %s', $testName) . "</div>\n";
+		echo "<div class='msg'>" . __d('cake_developer', 'Stack trace:') . '<br />' . $trace . "</div>\n";
 		echo "</li>\n";
 	}
 
@@ -272,8 +272,8 @@ public function paintException($message, $test) {
 		echo "<span>" . get_class($message) . "</span>";
 
 		echo "<div class='msg'>" . $this->_htmlEntities($message->getMessage()) . "</div>\n";
-		echo "<div class='msg'>" . __d('cake', 'Test case: %s', $testName) . "</div>\n";
-		echo "<div class='msg'>" . __d('cake', 'Stack trace:') . '<br />' . $trace . "</div>\n";
+		echo "<div class='msg'>" . __d('cake_developer', 'Test case: %s', $testName) . "</div>\n";
+		echo "<div class='msg'>" . __d('cake_developer', 'Stack trace:') . '<br />' . $trace . "</div>\n";
 		echo "</li>\n";
 	}
 
@@ -341,6 +341,6 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
 		if (!$this->_headerSent) {
 			echo $this->paintHeader();
 		}
-		echo '<h2>' . __d('cake', 'Running  %s', $suite->getName())  . '</h2>';
+		echo '<h2>' . __d('cake_developer', 'Running  %s', $suite->getName())  . '</h2>';
 	}
-}
+}