From 41fe51d4b901f353b94fec84c731f0be407f2ba5 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 16 Apr 2010 01:45:34 +1000
Subject: [PATCH] Cache classes converted to new shortcut translation usage.

---
 cake/libs/cache.php          | 8 ++++----
 cake/libs/cache/file.php     | 2 +-
 cake/libs/cache/memcache.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index a2115ec84..c4c769a26 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -534,7 +534,7 @@ class CacheEngine {
  * @return boolean True if the data was succesfully cached, false on failure
  */
 	public function write($key, &$value, $duration) {
-		trigger_error(sprintf(__('Method write() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+		trigger_error(sprintf(__('Method write() not implemented in %s'), get_class($this)), E_USER_ERROR);
 	}
 
 /**
@@ -544,7 +544,7 @@ class CacheEngine {
  * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
  */
 	public function read($key) {
-		trigger_error(sprintf(__('Method read() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+		trigger_error(sprintf(__('Method read() not implemented in %s'), get_class($this)), E_USER_ERROR);
 	}
 
 /**
@@ -555,7 +555,7 @@ class CacheEngine {
  * @return New incremented value, false otherwise
  */
 	public function increment($key, $offset = 1) {
-		trigger_error(sprintf(__('Method increment() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+		trigger_error(sprintf(__('Method increment() not implemented in %s'), get_class($this)), E_USER_ERROR);
 	}
 /**
  * Decrement a number under the key and return decremented value
@@ -565,7 +565,7 @@ class CacheEngine {
  * @return New incremented value, false otherwise
  */
 	public function decrement($key, $offset = 1) {
-		trigger_error(sprintf(__('Method decrement() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+		trigger_error(sprintf(__('Method decrement() not implemented in %s'), get_class($this)), E_USER_ERROR);
 	}
 /**
  * Delete a key from the cache
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index 656e3511f..c56e94dd4 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -254,7 +254,7 @@ class FileEngine extends CacheEngine {
 	function __active() {
 		if ($this->_init && !is_writable($this->settings['path'])) {
 			$this->_init = false;
-			trigger_error(sprintf(__('%s is not writable', true), $this->settings['path']), E_USER_WARNING);
+			trigger_error(sprintf(__('%s is not writable'), $this->settings['path']), E_USER_WARNING);
 		}
 		return true;
 	}
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 30d602e2b..aa3bcbc34 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -132,7 +132,7 @@ class MemcacheEngine extends CacheEngine {
  */
 	public function increment($key, $offset = 1) {
 		if ($this->settings['compress']) {
-			trigger_error(sprintf(__('Method increment() not implemented for compressed cache in %s', true), get_class($this)), E_USER_ERROR);
+			trigger_error(sprintf(__('Method increment() not implemented for compressed cache in %s'), get_class($this)), E_USER_ERROR);
 		}
 		return $this->__Memcache->increment($key, $offset);
 	}
@@ -147,7 +147,7 @@ class MemcacheEngine extends CacheEngine {
  */
 	public function decrement($key, $offset = 1) {
 		if ($this->settings['compress']) {
-			trigger_error(sprintf(__('Method decrement() not implemented for compressed cache in %s', true), get_class($this)), E_USER_ERROR);
+			trigger_error(sprintf(__('Method decrement() not implemented for compressed cache in %s'), get_class($this)), E_USER_ERROR);
 		}
 		return $this->__Memcache->decrement($key, $offset);
 	}