Merge pull request #1044 from prestamodule/development

Mail translation methods fix & template translation fix

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('"', '"', $string));

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>

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.