From 2542260f640da014405bf8009aa0d910ab776e32 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.coom>
Date: Wed, 21 Nov 2012 17:41:53 +0100
Subject: [PATCH] [-] CORE : fixed bug #PSCFV-5514 - Override of module
 language file type fr.php in theme

---
 classes/Translate.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/Translate.php b/classes/Translate.php
index 66eba9f83..9005e9366 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -127,6 +127,7 @@ class TranslateCore
 		static $translations_merged = array();
 
 		$name = $module instanceof Module ? $module->name : $module;
+		
 		if (!isset($translations_merged[$name]))
 		{
 			$filesByPriority = array(
@@ -138,16 +139,14 @@ class TranslateCore
 				// PrestaShop 1.4 translations
 				_PS_MODULE_DIR_.$name.'/'.Context::getContext()->language->iso_code.'.php'
 			);
-
 			foreach ($filesByPriority as $file)
 				if (Tools::file_exists_cache($file))
 				{
 					include_once($file);
-					$_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE;
+					$_MODULES = !empty($_MODULES) ? $_MODULES + $_MODULE : $_MODULE; //we use "+" instead of array_merge() because array merge erase existing values.
 					$translations_merged[$name] = true;
 				}
 		}
-
 		$key = md5(str_replace('\'', '\\\'', $string));
 
 		$cache_key = $name.'|'.$string.'|'.$source;