From ff98873fb5d0c6dfbdf03383da28a797f0f3066e Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Wed, 11 Apr 2012 16:03:57 +0000
Subject: [PATCH] // perf

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14591 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Translate.php             | 12 ++++++------
 config/smartyadmin.config.inc.php |  3 ++-
 config/smartyfront.config.inc.php |  5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/classes/Translate.php b/classes/Translate.php
index 1b234468d..85c847558 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -162,17 +162,17 @@ class TranslateCore
 			if (version_compare(_PS_VERSION_, '1.3.0.0') <= 0)
 				$_MODULES = array_change_key_case($_MODULES);
 
-			$currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.$key;
-			$defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.$key;
+			$currentKey = strtolower('<{'.$name.'}'._THEME_NAME_.'>'.$source.'_'.$key);
+			$defaultKey = strtolower('<{'.$name.'}prestashop>'.$source.'_'.$key);
 
 			if (isset($_MODULES[$currentKey]))
 				$ret = stripslashes($_MODULES[$currentKey]);
-			elseif (isset($_MODULES[Tools::strtolower($currentKey)]))
-				$ret = stripslashes($_MODULES[Tools::strtolower($currentKey)]);
+			elseif (isset($_MODULES[$currentKey]))
+				$ret = stripslashes($_MODULES[$currentKey]);
+			elseif (isset($_MODULES[$defaultKey]))
+				$ret = stripslashes($_MODULES[$defaultKey]);
 			elseif (isset($_MODULES[$defaultKey]))
 				$ret = stripslashes($_MODULES[$defaultKey]);
-			elseif (isset($_MODULES[Tools::strtolower($defaultKey)]))
-				$ret = stripslashes($_MODULES[Tools::strtolower($defaultKey)]);
 			// if translation was not found in module, look for it in AdminController or Helpers
 			elseif (!empty($_LANGADM))
 				$ret = Translate::getGenericAdminTranslation($string, $key, $_LANGADM);
diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php
index 3e59ae87d..e13a299bb 100644
--- a/config/smartyadmin.config.inc.php
+++ b/config/smartyadmin.config.inc.php
@@ -42,7 +42,7 @@ function smartyTranslate($params, &$smarty)
 
 	// If the template is part of a module
 	if (!empty($params['mod']))
-		return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
+		return Translate::getModuleTranslation($params['mod'], $params['s'], basename($filename, '.tpl'));
 
 	// If the tpl is at the root of the template folder
 	if (dirname($filename) == '.')
@@ -67,3 +67,4 @@ function smartyTranslate($params, &$smarty)
 
 	return Translate::getAdminTranslation($params['s'], $class, $addslashes, $htmlentities, $sprintf);
 }
+
diff --git a/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php
index b2f593365..d9ecccaa5 100644
--- a/config/smartyfront.config.inc.php
+++ b/config/smartyfront.config.inc.php
@@ -38,14 +38,15 @@ function smartyTranslate($params, &$smarty)
 	$string = str_replace('\'', '\\\'', $params['s']);
 	$filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath());
 
-	$key = Tools::substr(basename($filename), 0, -4).'_'.md5($string);
+	$basename = basename($filename, '.tpl');
+	$key = $basename.'_'.md5($string);
 
 	if (isset($smarty->source) && (strpos($smarty->source->filepath, DIRECTORY_SEPARATOR.'override'.DIRECTORY_SEPARATOR) !== false))
 		$key = 'override_'.$key;
 
 	$lang_array = $_LANG;
 	if ($params['mod'])
-		return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
+		return Translate::getModuleTranslation($params['mod'], $params['s'], $basename);
 	else if ($params['pdf'])
 		return Translate::getPdfTranslation($params['s']);