diff --git a/classes/Mail.php b/classes/Mail.php index 42a53acf6..89116ae64 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -40,7 +40,7 @@ class MailCore * Send Email * * @param int $id_lang Language of the email (to translate the template) - * @param string $template Template + * @param string $template Template: the name of template not be a var but a string ! * @param string $subject * @param string $templateVars * @param string $to diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 791574805..5fa4c4400 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -435,7 +435,14 @@ abstract class PaymentModuleCore extends Module '{lastname}' => $customer->lastname, '{id_order}' => $order->reference ); - Mail::Send((int)$order->id_lang, 'voucher', Mail::l('New voucher regarding your order ', (int)$order->id_lang).$order->reference, $params, $customer->email, $customer->firstname.' '.$customer->lastname); + Mail::Send( + (int)$order->id_lang, + 'voucher', + sprintf(Mail::l('New voucher regarding your order %s', (int)$order->id_lang), $order->reference), + $params, + $customer->email, + $customer->firstname.' '.$customer->lastname + ); } } diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 6e354cc57..2936b5268 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -408,7 +408,7 @@ class AdminCustomerThreadsControllerCore extends AdminController if (Mail::Send( (int)$ct->id_lang, 'reply_msg', - Mail::l('An answer to your message is available', $ct->id_lang).' #ct'.$ct->id.'#tc'.$ct->token, + sprintf(Mail::l('An answer to your message is available #ct%1$s #tc%2$s', $ct->id_lang), $ct->id, $ct->token), $params, Tools::getValue('msg_email'), null, null, null, $file_attachment, null, _PS_MAIL_DIR_, true)) { diff --git a/mails/de/lang.php b/mails/de/lang.php index 86d29a0ce..40fe83adf 100644 --- a/mails/de/lang.php +++ b/mails/de/lang.php @@ -7,6 +7,7 @@ $_LANGMAIL['Process the payment of your order'] = ''; $_LANGMAIL['Message from contact form'] = 'Nachricht aus dem Kontaktformular'; $_LANGMAIL['Your message has been correctly sent'] = 'Ihre Nachricht ist korrekt gesendet worden'; $_LANGMAIL['New credit slip regarding your order'] = 'Gutschrift zu Ihrer Bestellung'; +$_LANGMAIL['Virtual product to download'] = ''; $_LANGMAIL['Fwd: Customer message'] = 'Fwd: Kundennachricht'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt'; $_LANGMAIL['Package in transit'] = 'Paket versendet'; @@ -17,18 +18,19 @@ $_LANGMAIL['New message regarding your order'] = 'Neue Nachricht zu Ihrer Bestel $_LANGMAIL['Your order return state has changed'] = 'Der Status Ihrer Rücksendung wurde geändert'; $_LANGMAIL['Your new admin password'] = 'Ihr neues Administrator-Kennwort'; $_LANGMAIL['Password query confirmation'] = 'Bestätigung der Kennwortänderung'; -$_LANGMAIL['An answer to your message is available'] = 'Sie haben eine Antwort auf Ihre Nachricht erhalten'; -$_LANGMAIL['New voucher regarding your order '] = 'Neuer Gutschein zu Ihrer Bestellung'; +$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Sie haben eine Antwort auf Ihre Nachricht erhalten #ct%1$s #tc%2$s'; +$_LANGMAIL['New voucher regarding your order %s'] = 'Neuer Gutschein zu Ihrer Bestellung %s'; $_LANGMAIL['Newsletter confirmation'] = 'Bestätigung Ihrer Anmeldung zu unserem Newsletter'; $_LANGMAIL['Email verification'] = ''; $_LANGMAIL['Newsletter voucher'] = 'Newsletter-Gutschein'; $_LANGMAIL['Your wishlist\\\'s link'] = 'Ihr Wunschlisten-Link'; -$_LANGMAIL['Message from '] = 'Nachricht von'; +$_LANGMAIL['Message from %1$s %2$s'] = 'Nachricht von %1$s %2$s'; $_LANGMAIL['Your cart and your discount'] = 'Gutschein zu Ihrem offenen Warenkorb'; $_LANGMAIL['Thanks for your order'] = 'Wir danken für Ihren Auftrag'; $_LANGMAIL['You are one of our best customers'] = 'Sie sind einer unserer besten Kunden'; $_LANGMAIL['We miss you'] = 'Wir danken für Ihr Vertrauen'; $_LANGMAIL['Product available'] = 'Produkt wieder verfügbar'; +$_LANGMAIL['New order - #%06d'] = ''; $_LANGMAIL['Stock coverage'] = ''; $_LANGMAIL['Product out of stock'] = 'Produkt leider ausverkauft'; $_LANGMAIL['Error reporting from your PayPal module'] = 'Fehlerbericht aus Ihrem PayPal Modul'; diff --git a/mails/es/account.html b/mails/es/account.html index d52e95511..844ff7727 100644 --- a/mails/es/account.html +++ b/mails/es/account.html @@ -5,48 +5,48 @@
| - |
| Hola {firstname} {lastname}, | -
| - |
| Detalles de tu cuenta | -
| - |
| Email: {email} Contraseña: {passwd} |
-
| - |
| Consejos de Seguridad: Mantén los datos de tu cuenta en lugar seguro. No des los detalles de tu cuenta a nadie. Cambia tu contraseña regularmente. Si sospechas que alguien esta usando ilegalmente tu cuenta, avÃsanos inmediatamente. |
-
| - |
| Ahora podrás guardar y consultar tus pedidos en nuestra web: {shop_name}. | -
| - |
| {shop_name} desarrollado por PrestaShopâ„¢ | -
| + |
| Hola {firstname} {lastname}, | +
| + |
| Detalles de tu cuenta | +
| + |
| Email: {email} Contraseña: {passwd} |
+
| + |
| Consejos de Seguridad: Mantén los datos de tu cuenta en lugar seguro. No des los detalles de tu cuenta a nadie. Cambia tu contraseña regularmente. Si sospechas que alguien esta usando ilegalmente tu cuenta, avísanos inmediatamente. |
+
| + |
| Ahora podrás guardar y consultar tus pedidos en nuestra web: {shop_name}. | +
| + |
| {shop_name} desarrollado por PrestaShop™ | +