From e660265a1cf4c55d30f52b2b30f03a01802eed81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 23 Jan 2013 14:58:37 +0100
Subject: [PATCH] [-] BO: Fix translations for overridden templates #PSCFV-7391

---
 config/smartyadmin.config.inc.php                 |  2 ++
 controllers/admin/AdminTranslationsController.php | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php
index c54adae47..60d9a149f 100644
--- a/config/smartyadmin.config.inc.php
+++ b/config/smartyadmin.config.inc.php
@@ -65,6 +65,8 @@ function smartyTranslate($params, &$smarty)
 		// Eg. xxx/controllers/customers/xxx => AdminCustomers
 		if ($key !== false)
 			$class = 'Admin'.Tools::toCamelCase($folder_tree[$key + 1], true);
+		elseif (isset($folder_tree[0]))
+			$class = 'Admin'.Tools::toCamelCase($folder_tree[0], true);
 		else
 			$class = null;
 	}
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 4b10fe9f1..530d21dd0 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1751,8 +1751,14 @@ class AdminTranslationsControllerCore extends AdminController
 					if (preg_match('#controllers#', $tmp))
 					{
 						$parent_class = explode(DIRECTORY_SEPARATOR, $tmp);
-						$key = array_search('controllers', $parent_class);
-						$prefix_key = 'Admin'.ucfirst($parent_class[$key + 1]);
+						$override = array_search('override', $parent_class);
+						if ($override !== false)
+							$prefix_key = 'Admin'.ucfirst($parent_class[count($parent_class) - 1]);
+						else
+						{
+							$key = array_search('controllers', $parent_class);
+							$prefix_key = 'Admin'.ucfirst($parent_class[$key + 1]);
+						}
 					}
 					else
 						$prefix_key = 'Admin'.ucfirst(substr($tmp, strrpos($tmp, DIRECTORY_SEPARATOR) + 1, $pos));