[-] BO : fix #PSCFV-3893

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();

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,

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';

mails/de/order_changed.html

@@ -5,7 +5,7 @@
 	<title>Message from {shop_name}</title>
 </head>
 <body>
-<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
 <td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>

mails/es/employee_password.html

@@ -5,7 +5,7 @@
 	<title>Mensaje desde {shop_name}</title>
 </head>
 <body>
-<table>
+	<table>
 <tbody>
 <tr>
 <td align="left"><a title="{shop_name}" href="{shop_url}"><img src="{shop_url}" alt="{shop_name}" /></a></td>

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';

mails/es/order_changed.html

@@ -5,7 +5,7 @@
 	<title>Message from {shop_name}</title>
 </head>
 <body>
-<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
 <td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>

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';

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';

mails/it/order_changed.html

@@ -5,7 +5,7 @@
 	<title>Message from {shop_name}</title>
 </head>
 <body>
-<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
 <td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>

mails/it/order_conf.html

@@ -33,12 +33,9 @@
 </tr>
 <tr>
 <td align="left">
-<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
+<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"><!-- Title -->
-<!-- Title -->
 <tbody>
-<tr style="background-color: #b9babe; text-align: center;">
+<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 0.6em 0;">Riferimento</th><th style="width: 35%; padding: 0.6em 0;">Prodotto</th><th style="width: 15%; padding: 0.6em 0;">Prezzo unitario</th><th style="width: 15%; padding: 0.6em 0;">Quantit&agrave;</th><th style="width: 20%; padding: 0.6em 0;">Prezzo totale</th></tr>
-<th style="width: 15%; padding: 0.6em 0;">Riferimento</th><th style="width: 35%; padding: 0.6em 0;">Prodotto</th><th style="width: 15%; padding: 0.6em 0;">Prezzo unitario</th><th style="width: 15%; padding: 0.6em 0;">Quantit&agrave;</th><th style="width: 20%; padding: 0.6em 0;">Prezzo totale</th>
-</tr>
 <tr>
 <td colspan="5">{products}</td>
 </tr>