From fd6d92d5c4c4e677ce9d22fce30d1697032d5e2b Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Wed, 11 Apr 2012 08:30:02 +0000
Subject: [PATCH] // missing files

---
 config/defines_uri.inc.php                        | 4 ++--
 config/smartyfront.config.inc.php                 | 7 ++++++-
 controllers/admin/AdminTranslationsController.php | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/defines_uri.inc.php b/config/defines_uri.inc.php
index bc408a787..918010c0f 100644
--- a/config/defines_uri.inc.php
+++ b/config/defines_uri.inc.php
@@ -32,14 +32,14 @@ define('_THEME_DIR_',      _THEMES_DIR_._THEME_NAME_.'/');
 define('_THEME_IMG_DIR_',  _THEME_DIR_.'img/');
 define('_THEME_CSS_DIR_',  _THEME_DIR_.'css/');
 define('_THEME_JS_DIR_',   _THEME_DIR_.'js/');
-define('_THEME_OVERRIDE_DIR_', _PS_THEME_DIR_.'override/');
+define('_PS_THEME_OVERRIDE_DIR_', _PS_THEME_DIR_.'override/');
 
 /* For mobile devices */
 if (file_exists(_PS_THEME_DIR_.'mobile/'))
 {
 	define('_PS_THEME_MOBILE_DIR_', _PS_THEME_DIR_.'mobile/');
 	define('_THEME_MOBILE_DIR_', _THEMES_DIR_._THEME_NAME_.'/mobile/');
-	define('_THEME_MOBILE_OVERRIDE_DIR_', _PS_THEME_MOBILE_DIR_.'override/');
+	define('_PS_THEME_MOBILE_OVERRIDE_DIR_', _PS_THEME_MOBILE_DIR_.'override/');
 }
 else
 {
diff --git a/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php
index cb22d8830..e045a4f92 100644
--- a/config/smartyfront.config.inc.php
+++ b/config/smartyfront.config.inc.php
@@ -37,11 +37,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);
+	if (isset($smarty->source) && preg_match('#/override/#', $smarty->source->filepath))
+		$key = 'override_'.$key;
+
 	$lang_array = $_LANG;
 	if ($params['mod'])
 		return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
-	else if ($params['pdf']) 
+	else if ($params['pdf'])
 		return Translate::getPdfTranslation($params['s']);
 
 	if ($lang_array != null && isset($lang_array[$key]))
@@ -56,3 +60,4 @@ function smartyTranslate($params, &$smarty)
 
 	return $params['js'] ? $msg : Tools::htmlentitiesUTF8($msg);
 }
+
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index c1a4da041..faa3c2a54 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -941,7 +941,7 @@ class AdminTranslationsControllerCore extends AdminController
 		foreach ($templates_per_directory as $template_dir => $templates)
 		{
 			$prefix = '';
-			if ($template_dir == _THEME_OVERRIDE_DIR_)
+			if ($template_dir == _PS_THEME_OVERRIDE_DIR_)
 				$prefix = 'override_';
 
 			foreach ($templates as $template)