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

// changed English strings, especially focusing on colons harmonization

Browse Source
This commit is contained in:
fram
2013-03-12 19:39:30 +01:00
parent 09afe53452
commit 77efe4c04e
590 changed files with 6160 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/PasswordController.php
+7 -7
View File
@@ -37,13 +37,13 @@ class PasswordControllerCore extends FrontController
if (Tools::isSubmit('email'))
{
if (!($email = Tools::getValue('email')) || !Validate::isEmail($email))
$this->errors[] = Tools::displayError('Invalid e-mail address');
$this->errors[] = Tools::displayError('Invalid email address.');
else
{
$customer = new Customer();
$customer->getByemail($email);
if (!Validate::isLoadedObject($customer))
$this->errors[] = Tools::displayError('There is no account registered to this e-mail address.');
$this->errors[] = Tools::displayError('There is no account registered for this email address.');
elseif (!$customer->active)
$this->errors[] = Tools::displayError('You cannot regenerate the password for this account.');
elseif ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0)
@@ -59,7 +59,7 @@ class PasswordControllerCore extends FrontController
if (Mail::Send($this->context->language->id, 'password_query', Mail::l('Password query confirmation'), $mail_params, $customer->email, $customer->firstname.' '.$customer->lastname))
$this->context->smarty->assign(array('confirmation' => 2, 'email' => $customer->email));
else
$this->errors[] = Tools::displayError('Error occurred while sending the e-mail.');
$this->errors[] = Tools::displayError('An error occurred while sending the email.');
}
}
}
@@ -92,17 +92,17 @@ class PasswordControllerCore extends FrontController
if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new password'), $mail_params, $customer->email, $customer->firstname.' '.$customer->lastname))
$this->context->smarty->assign(array('confirmation' => 1, 'email' => $customer->email));
else
$this->errors[] = Tools::displayError('Error occurred while sending the e-mail.');
$this->errors[] = Tools::displayError('An error occurred while sending the email.');
}
else
$this->errors[] = Tools::displayError('An error occurred with your account and your new password cannot be sent to your e-mail. Please report your problem using the contact form.');
$this->errors[] = Tools::displayError('An error occurred with your account, which prevents us from sending you a new password. Please report your this issue using the contact form.');
}
}
else
$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you\'ve submitted.');
}
elseif (Tools::getValue('token') || Tools::getValue('id_customer'))
$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you\'ve submitted.');
}
/**