From 2c802ad4ec3a88b00c078bc2c0cebb3bc664e315 Mon Sep 17 00:00:00 2001 From: Vincent Terenti Date: Tue, 23 Apr 2013 19:10:31 +0200 Subject: [PATCH] // Fix translation behavior --- controllers/admin/AdminTranslationsController.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 4fb9dd5a7..bc2c4ef5f 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -920,9 +920,7 @@ class AdminTranslationsControllerCore extends AdminController foreach ($matches as $key) { $md5_key = md5($key); - $module_key = null; - if ($theme_name) - $module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key; + $module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key; $default_key = '<{'.Tools::strtolower($module_name).'}prestashop>'.Tools::strtolower($template_name).'_'.$md5_key; // to avoid duplicate entry if (!in_array($module_key, $array_check_duplicate)) @@ -930,13 +928,13 @@ class AdminTranslationsControllerCore extends AdminController $array_check_duplicate[] = $module_key; if (!isset($this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'])) $this->total_expression++; - - if ($module_key && array_key_exists($module_key, $GLOBALS[$name_var])) + if ($theme_name && array_key_exists($module_key, $GLOBALS[$name_var])) $this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$module_key], ENT_COMPAT, 'UTF-8'); elseif (array_key_exists($default_key, $GLOBALS[$name_var])) $this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$default_key], ENT_COMPAT, 'UTF-8'); else { + //d(array($module_key, $default_key, $key, $GLOBALS[$name_var])); $this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = ''; $this->missing_translations++; }