From d064be158706468bc82c7cd85b3bdb14d7c9e76b Mon Sep 17 00:00:00 2001
From: prestamodule <support@presta-module.com>
Date: Tue, 26 Nov 2013 11:22:57 +0100
Subject: [PATCH 1/2] - Fix multiple translations in a same process for
 different id_lang If id_lang are mixed (1, 2, 3, 1, 4, 2...) the translations
 aren't correctly populated from the theme lang.php override if include_once
 is used. include must be used in order to handle mixed id_lang in a same
 process.

Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
---
 classes/Mail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Mail.php b/classes/Mail.php
index 76ffadc40..3fc073fa8 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -372,11 +372,11 @@ class MailCore
 
 		$file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL))
-			include_once($file_core);
+			include($file_core);
 
 		$file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_theme))
-			include_once($file_theme);
+			include($file_theme);
 
 		if (!is_array($_LANGMAIL))
 			return (str_replace('"', '&quot;', $string));

From 2b37db629ed3ae8b1d92e635493b72816ceeb457 Mon Sep 17 00:00:00 2001
From: prestamodule <support@presta-module.com>
Date: Tue, 26 Nov 2013 11:23:33 +0100
Subject: [PATCH 2/2] - Fix english translation for backoffice_order template

Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
---
 mails/en/backoffice_order.html | 2 +-
 mails/en/backoffice_order.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html
index cd5bd4286..a93abf583 100644
--- a/mails/en/backoffice_order.html
+++ b/mails/en/backoffice_order.html
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">A new command has been generated to you.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">A new order has been generated to you.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
diff --git a/mails/en/backoffice_order.txt b/mails/en/backoffice_order.txt
index 1f334e954..7b9dd828a 100644
--- a/mails/en/backoffice_order.txt
+++ b/mails/en/backoffice_order.txt
@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-A new command has been generated to you.
+A new order has been generated to you.
 
 Go on {order_link} to finalize the payment.