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

[-] BO : fix #PSCFV-3893

Browse Source
This commit is contained in:
lLefevre
2012-09-04 07:57:59 +00:00
parent 32490e39d1
commit 31d5d71e73
16 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/admin/AdminLoginController.php
View File

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

2
controllers/front/PasswordController.php
View File

@@ -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,

3
mails/de/lang.php
View File

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

2
mails/de/order_changed.html
View File

@@ -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>

2
mails/es/employee_password.html
View File

@@ -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>

3
mails/es/lang.php
View File

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

20
mails/es/order_changed.html
View File

@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title>
</head>
<body>
<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>
@@ -44,6 +44,6 @@
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

2
mails/fr/lang.php
View File

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

3
mails/it/lang.php
View File

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

20
mails/it/order_changed.html
View File

@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title>
</head>
<body>
<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>
@@ -44,6 +44,6 @@
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

25
mails/it/order_conf.html
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Messaggio da {shop_name}</title>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Messaggio da {shop_name}</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<tbody>
<tr>
@@ -33,12 +33,9 @@
</tr>
<tr>
<td align="left">
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
<!-- Title -->
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"><!-- Title -->
<tbody>
<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>
<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>
<tr>
<td colspan="5">{products}</td>
</tr>
@@ -118,6 +115,6 @@
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</table>
</body>
</html>

2
mails/it/voucher_new.txt
View File

@@ -11,4 +11,4 @@ Thank you for shopping at {shop_name}.
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
{shop_url} powered by PrestaShop™

2
modules/blocknewsletter/mails/es/newsletter_verif.txt
View File

@@ -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™
{shop_url} powered by PrestaShop™

2
modules/blocknewsletter/mails/it/newsletter_verif.txt
View File

@@ -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™
{shop_url} powered by PrestaShop™

2
modules/blockwishlist/mails/es/wishlist.txt
View File

@@ -5,4 +5,4 @@ Hola,
{shop_url} desarrollado por PrestaShop™
{shop_url} desarrollado por PrestaShop™

2
modules/mailalerts/mails/es/productoutofstock.txt
View File

@@ -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™
{shop_url} desarrollado por PrestaShop™