From 3e24a6db3b6c9a95d60effa5c80aadb59dd8a0af Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 4 May 2004 20:26:08 +0000
Subject: [PATCH] gives better performance

---
 phpgwapi/inc/class.translation_sql.inc.php | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.translation_sql.inc.php b/phpgwapi/inc/class.translation_sql.inc.php
index 3b032f26f2..70e834da6a 100644
--- a/phpgwapi/inc/class.translation_sql.inc.php
+++ b/phpgwapi/inc/class.translation_sql.inc.php
@@ -47,6 +47,10 @@
 
 		function translation($warnings = False)
 		{
+			for ($i = 1; $i <= 9; $i++)
+			{
+				$this->placeholders[] = '%'.$i;
+			}
 			$this->db = is_object($GLOBALS['phpgw']->db) ? $GLOBALS['phpgw']->db : $GLOBALS['phpgw_setup']->db;
 			if (!isset($GLOBALS['phpgw_setup']))
 			{
@@ -137,27 +141,36 @@
 		*/
 		function translate($key, $vars=false, $not_found='*' )
 		{
-			if (!$vars)
-			{
-				$vars = array();
-			}
 			if (!is_array(@$GLOBALS['lang']) || !count($GLOBALS['lang']))
 			{
 				$this->init();
 			}
 			$ret = $key.$not_found;	// save key if we dont find a translation
 
-			$key = strtolower(trim(substr($key,0,MAX_MESSAGE_ID_LENGTH)));
-
 			if (isset($GLOBALS['lang'][$key]))
 			{
 				$ret = $GLOBALS['lang'][$key];
 			}
-			$ndx = 1;
-			foreach($vars as $val)
+			else
 			{
-				$ret = preg_replace( "/%$ndx/", $val, $ret );
-				++$ndx;
+				$new_key = strtolower(trim(substr($key,0,MAX_MESSAGE_ID_LENGTH)));
+
+				if (isset($GLOBALS['lang'][$new_key]))
+				{
+					// we save the original key for performance
+					$ret = $GLOBALS['lang'][$key] = $GLOBALS['lang'][$new_key];
+				}
+			}
+			if (is_array($vars) && count($vars))
+			{
+				if (count($vars) > 1)
+				{
+					$ret = str_replace($this->placeholders,$vars,$ret);
+				}
+				else
+				{
+					$ret = str_replace('%1',$vars[0],$ret);
+				}
 			}
 			return $ret;
 		}