diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index 57132ecc0..a98d1e678 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -218,7 +218,7 @@ class AdminLoginControllerCore extends AdminController '{passwd}' => $pwd ); - if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new admin password', (int)Configuration::get('PS_LANG_DEFAULT')), $params, $employee->email, $employee->firstname.' '.$employee->lastname)) + if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new password', (int)Configuration::get('PS_LANG_DEFAULT')), $params, $employee->email, $employee->firstname.' '.$employee->lastname)) { // Update employee only if the mail can be sent $result = $employee->update(); diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index 24d87f631..e49d5e0ff 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -85,7 +85,7 @@ class PasswordControllerCore extends FrontController if ($customer->update()) { Hook::exec('actionPasswordRenew', array('customer' => $customer, 'password' => $password)); - if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new admin password'), + if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new password'), array( '{email}' => $customer->email, '{lastname}' => $customer->lastname, diff --git a/mails/de/lang.php b/mails/de/lang.php index 40fe83adf..bb335c3e7 100644 --- a/mails/de/lang.php +++ b/mails/de/lang.php @@ -12,11 +12,12 @@ $_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'; $_LANGMAIL['Log: You have a new alert from your shop'] = 'Sie haben ein Log-Alert aus Ihrem Shop erhalten'; +$_LANGMAIL['Your order has been changed'] = ''; $_LANGMAIL['Order confirmation'] = 'Automatische Bestellbestätigung'; $_LANGMAIL['Message from a customer'] = 'Nachricht eines Kunden'; $_LANGMAIL['New message regarding your order'] = 'Neue Nachricht zu Ihrer Bestellung'; $_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['Your new password'] = 'Ihr neues Kennwort'; $_LANGMAIL['Password query confirmation'] = 'Bestätigung der Kennwortänderung'; $_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'; diff --git a/mails/de/order_changed.html b/mails/de/order_changed.html index 61dc4118d..3ac57a8f5 100644 --- a/mails/de/order_changed.html +++ b/mails/de/order_changed.html @@ -5,7 +5,7 @@ Message from {shop_name} - +
diff --git a/mails/es/employee_password.html b/mails/es/employee_password.html index 09f245490..89313e8ab 100644 --- a/mails/es/employee_password.html +++ b/mails/es/employee_password.html @@ -5,7 +5,7 @@ Mensaje desde {shop_name} -
{shop_name}
+
diff --git a/mails/es/lang.php b/mails/es/lang.php index 478373822..db5800b3e 100644 --- a/mails/es/lang.php +++ b/mails/es/lang.php @@ -12,11 +12,12 @@ $_LANGMAIL['Fwd: Customer message'] = 'Fw: Mensaje de cliente'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Su cuenta de invitado se transformo en cuenta de cliente'; $_LANGMAIL['Package in transit'] = 'Paquete en transito'; $_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Tiene un nuevo alerta desde su tienda'; +$_LANGMAIL['Your order has been changed'] = ''; $_LANGMAIL['Order confirmation'] = ''; $_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente'; $_LANGMAIL['New message regarding your order'] = ''; $_LANGMAIL['Your order return state has changed'] = 'El estado de retorno de su orden ha cambiado'; -$_LANGMAIL['Your new admin password'] = 'Su nueva clave de administrador'; +$_LANGMAIL['Your new password'] = 'Su nueva clave'; $_LANGMAIL['Password query confirmation'] = 'Confirmación de password'; $_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = ''; $_LANGMAIL['New voucher regarding your order %s'] = 'Nuevo bono con respecto a su orden %s'; diff --git a/mails/es/order_changed.html b/mails/es/order_changed.html index 5f22d193e..3ac57a8f5 100644 --- a/mails/es/order_changed.html +++ b/mails/es/order_changed.html @@ -1,11 +1,11 @@ - - - - - Message from {shop_name} - - -
{shop_name}
+ + + + + Message from {shop_name} + + +
@@ -44,6 +44,6 @@ -
{shop_name}{shop_name} powered by PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/lang.php b/mails/fr/lang.php index 93a186665..f1694fe5f 100644 --- a/mails/fr/lang.php +++ b/mails/fr/lang.php @@ -17,7 +17,7 @@ $_LANGMAIL['Order confirmation'] = 'Confirmation de commande'; $_LANGMAIL['Message from a customer'] = 'Message d\'un client'; $_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande'; $_LANGMAIL['Your order return state has changed'] = 'Nouveau statut de commande'; -$_LANGMAIL['Your new admin password'] = 'Votre nouveau mot de passe'; +$_LANGMAIL['Your new password'] = 'Votre nouveau mot de passe'; $_LANGMAIL['Password query confirmation'] = 'Confirmation de demande de mot de passe'; $_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'Une réponse à votre message est disponible #ct%1$s #tc%2$s'; $_LANGMAIL['New voucher regarding your order %s'] = 'Nouveau bon de réduction concernant votre commande %s'; diff --git a/mails/it/lang.php b/mails/it/lang.php index d98c15de7..5b1cddfc2 100644 --- a/mails/it/lang.php +++ b/mails/it/lang.php @@ -12,11 +12,12 @@ $_LANGMAIL['Fwd: Customer message'] = 'Messaggio cliente'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Il tuo account ospite è stato trasformato in account cliente'; $_LANGMAIL['Package in transit'] = 'Pacco in viaggio'; $_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Hai un nuovo Avviso dal tuo negozio'; +$_LANGMAIL['Your order has been changed'] = ''; $_LANGMAIL['Order confirmation'] = 'Conferma ordine'; $_LANGMAIL['Message from a customer'] = 'Messaggio da un cliente'; $_LANGMAIL['New message regarding your order'] = 'Nuovo messaggio riguardo al tuo ordine'; $_LANGMAIL['Your order return state has changed'] = 'Nuovo status dell\'ordine'; -$_LANGMAIL['Your new admin password'] = 'La tua nuova password amministratore'; +$_LANGMAIL['Your new password'] = 'La tua nuova password'; $_LANGMAIL['Password query confirmation'] = 'Conferma richiesta password'; $_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'E\' disponibile una risposta al tuo messaggio #ct%1$s #tc%2$s'; $_LANGMAIL['New voucher regarding your order %s'] = 'Nuovo buono sconto riguardante il tuo ordine %s'; diff --git a/mails/it/order_changed.html b/mails/it/order_changed.html index 5f22d193e..3ac57a8f5 100644 --- a/mails/it/order_changed.html +++ b/mails/it/order_changed.html @@ -1,11 +1,11 @@ - - - - - Message from {shop_name} - - - + + + + + Message from {shop_name} + + +
@@ -44,6 +44,6 @@ -
{shop_name}{shop_name} powered by PrestaShop™
- + + \ No newline at end of file diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index a70e60aa1..29e8f6238 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -1,10 +1,10 @@ - - - - - Messaggio da {shop_name} - - + + + + + Messaggio da {shop_name} + + @@ -33,12 +33,9 @@
- - +
- - - + @@ -118,6 +115,6 @@ -
RiferimentoProdottoPrezzo unitarioQuantitàPrezzo totale
RiferimentoProdottoPrezzo unitarioQuantitàPrezzo totale
{products}
{shop_name} powered with PrestaShop™
- +
+ \ No newline at end of file diff --git a/mails/it/voucher_new.txt b/mails/it/voucher_new.txt index e9e4e64b8..1761525de 100644 --- a/mails/it/voucher_new.txt +++ b/mails/it/voucher_new.txt @@ -11,4 +11,4 @@ Thank you for shopping at {shop_name}. {shop_name} - {shop_url} -{shop_url} powered by PrestaShop™ \ No newline at end of file +{shop_url} powered by PrestaShop™ diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.txt b/modules/blocknewsletter/mails/es/newsletter_verif.txt index 50902fd80..596f9ee89 100644 --- a/modules/blocknewsletter/mails/es/newsletter_verif.txt +++ b/modules/blocknewsletter/mails/es/newsletter_verif.txt @@ -3,4 +3,4 @@ Hi, You've just subscribe to our newsletter, please confirm your request by clicking the link below: {verif_url} -{shop_url} powered by PrestaShop™ \ No newline at end of file +{shop_url} powered by PrestaShop™ diff --git a/modules/blocknewsletter/mails/it/newsletter_verif.txt b/modules/blocknewsletter/mails/it/newsletter_verif.txt index 50902fd80..596f9ee89 100644 --- a/modules/blocknewsletter/mails/it/newsletter_verif.txt +++ b/modules/blocknewsletter/mails/it/newsletter_verif.txt @@ -3,4 +3,4 @@ Hi, You've just subscribe to our newsletter, please confirm your request by clicking the link below: {verif_url} -{shop_url} powered by PrestaShop™ \ No newline at end of file +{shop_url} powered by PrestaShop™ diff --git a/modules/blockwishlist/mails/es/wishlist.txt b/modules/blockwishlist/mails/es/wishlist.txt index 346b0cc67..a4f6eb2cf 100644 --- a/modules/blockwishlist/mails/es/wishlist.txt +++ b/modules/blockwishlist/mails/es/wishlist.txt @@ -5,4 +5,4 @@ Hola, -{shop_url} desarrollado por PrestaShop™ \ No newline at end of file +{shop_url} desarrollado por PrestaShop™ diff --git a/modules/mailalerts/mails/es/productoutofstock.txt b/modules/mailalerts/mails/es/productoutofstock.txt index 126a8722f..44b6ebe42 100644 --- a/modules/mailalerts/mails/es/productoutofstock.txt +++ b/modules/mailalerts/mails/es/productoutofstock.txt @@ -7,4 +7,4 @@ Existencias restantes: {qty} Se aconseja abrir administrador del producto Producto a fin de reponer el inventario. -{shop_url} desarrollado por PrestaShop™ \ No newline at end of file +{shop_url} desarrollado por PrestaShop™