From 6b2547714960641dd55b341061dab1cba93ae203 Mon Sep 17 00:00:00 2001
From: tof <>
Date: Sun, 9 Mar 2008 15:02:01 +0000
Subject: Fixed #636

---
 framework/I18N/TTranslate.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'framework/I18N/TTranslate.php')

diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 409015ed..327119fd 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -239,17 +239,17 @@ class TTranslate extends TI18NControl
 		if(is_null($config = $app->getTranslationConfiguration()))
 			return strtr($text, $subs);
 
-		Translation::init();
-
 		$catalogue = $this->getCatalogue();
 		if(empty($catalogue) && isset($config['catalogue']))
 			$catalogue = $config['catalogue'];
-
+		if (empty($catalogue)) $catalogue='messages';
+		Translation::init($catalogue);
+			
 		$key = $this->getKey();
 		if(!empty($key)) $text = $key;
 
 		//translate it
-		return Translation::formatter()->format($text,
+		return Translation::formatter($catalogue)->format($text,
 										$subs, $catalogue, $this->getCharset());
 	}
 }
-- 
cgit v1.2.3