From d7f275d70559c6164a58ae723c974c13196a27da Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@yahoo.co.uk>
Date: Sat, 12 Mar 2011 19:48:57 +0100
Subject: [PATCH] translation changes in the cache folder

	modified:   lib/Cake/Network/Http/HttpResponse.php
---
 lib/Cake/Cache/Cache.php                 | 4 ++--
 lib/Cake/Cache/Engine/FileEngine.php     | 6 +++---
 lib/Cake/Cache/Engine/MemcacheEngine.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php
index 59b62fd7a..00cd64c52 100644
--- a/lib/Cake/Cache/Cache.php
+++ b/lib/Cake/Cache/Cache.php
@@ -133,7 +133,7 @@ class Cache {
 		}
 		$cacheClass = $class . 'Engine';
 		if (!is_subclass_of($cacheClass, 'CacheEngine')) {
-			throw new CacheException(__('Cache engines must use CacheEngine as a base class.'));
+			throw new CacheException(__d('cake', 'Cache engines must use CacheEngine as a base class.'));
 		}
 		self::$_engines[$name] = new $cacheClass();
 		if (self::$_engines[$name]->init($config)) {
@@ -273,7 +273,7 @@ class Cache {
 		self::set(null, $config);
 		if ($success === false && $value !== '') {
 			trigger_error(
-				__("%s cache was unable to write '%s' to cache", $config, $key),
+				__d('cake', "%s cache was unable to write '%s' to cache", $config, $key),
 				E_USER_WARNING
 			);
 		}
diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
index 46ff892a3..f7c55e7e8 100644
--- a/lib/Cake/Cache/Engine/FileEngine.php
+++ b/lib/Cake/Cache/Engine/FileEngine.php
@@ -250,7 +250,7 @@ class FileEngine extends CacheEngine {
  * @throws CacheException
  */
 	public function decrement($key, $offset = 1) {
-		throw new CacheException(__('Files cannot be atomically decremented.'));
+		throw new CacheException(__d('cake', 'Files cannot be atomically decremented.'));
 	}
 
 /**
@@ -260,7 +260,7 @@ class FileEngine extends CacheEngine {
  * @throws CacheException
  */
 	public function increment($key, $offset = 1) {
-		throw new CacheException(__('Files cannot be atomically incremented.'));
+		throw new CacheException(__d('cake', 'Files cannot be atomically incremented.'));
 	}
 
 /**
@@ -296,7 +296,7 @@ class FileEngine extends CacheEngine {
 		$dir = new SplFileInfo($this->settings['path']);
 		if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
 			$this->_init = false;
-			trigger_error(__('%s is not writable', $this->settings['path']), E_USER_WARNING);
+			trigger_error(__d('cake', '%s is not writable', $this->settings['path']), E_USER_WARNING);
 			return false;
 		}
 		return true;
diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
index 012eceba0..e0e34a06a 100644
--- a/lib/Cake/Cache/Engine/MemcacheEngine.php
+++ b/lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -153,7 +153,7 @@ class MemcacheEngine extends CacheEngine {
 	public function increment($key, $offset = 1) {
 		if ($this->settings['compress']) {
 			throw new CacheException(
-				__('Method increment() not implemented for compressed cache in %s', __CLASS__)
+				__d('cake', 'Method increment() not implemented for compressed cache in %s', __CLASS__)
 			);
 		}
 		return $this->_Memcache->increment($key, $offset);
@@ -171,7 +171,7 @@ class MemcacheEngine extends CacheEngine {
 	public function decrement($key, $offset = 1) {
 		if ($this->settings['compress']) {
 			throw new CacheException(
-				__('Method decrement() not implemented for compressed cache in %s', __CLASS__)
+				__d('cake', 'Method decrement() not implemented for compressed cache in %s', __CLASS__)
 			);
 		}
 		return $this->_Memcache->decrement($key, $offset);