dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1044 from prestamodule/development

Browse Source 
Mail translation methods fix & template translation fix
This commit is contained in:
Jérôme Nadaud
2013-11-28 00:08:54 -08:00
parent 13061bdc04 2b37db629e
commit ccc388fab9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Mail.php
+2 -2
View File
@@ -372,11 +372,11 @@ class MailCore
$file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php'; $file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php';
if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL)) 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'; $file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php';
if (Tools::file_exists_cache($file_theme)) if (Tools::file_exists_cache($file_theme))
include_once($file_theme); include($file_theme);
if (!is_array($_LANGMAIL)) if (!is_array($_LANGMAIL))
return (str_replace('"', '"', $string)); return (str_replace('"', '"', $string));
mails/en/backoffice_order.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<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>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
mails/en/backoffice_order.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Hi {firstname} {lastname}, 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. Go on {order_link} to finalize the payment.