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 f7c76f60fb
commit ed947bc123
590 changed files with 6160 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/GuestTrackingController.php
+9 -9
View File
@@ -73,23 +73,23 @@ class GuestTrackingControllerCore extends FrontController
$email = Tools::getValue('email');
if (empty($order_reference) && empty($id_order))
$this->errors[] = Tools::displayError('Please provide your Order Reference');
$this->errors[] = Tools::displayError('Please provide your order\'s reference number.');
else if (empty($email))
$this->errors[] = Tools::displayError('Please provide your e-mail address');
$this->errors[] = Tools::displayError('Please provide a valid email address.');
else if (!Validate::isEmail($email))
$this->errors[] = Tools::displayError('Please provide a valid e-mail address');
$this->errors[] = Tools::displayError('Please provide a valid email address.');
else if (!Customer::customerExists($email, false, false))
$this->errors[] = Tools::displayError('There is no account associated with this e-mail address');
$this->errors[] = Tools::displayError('There is no account associated with this email address.');
else if (Customer::customerExists($email, false, true))
{
$this->errors[] = Tools::displayError('Your guest account has already been transformed into a customer account.').' '.
Tools::displayError('Please login to your customer account to view this order, this section is reserved for guest accounts');
Tools::displayError('Please login to your customer account to view this order. This section is reserved for guest accounts.');
$this->context->smarty->assign('show_login_link', true);
}
else if (!count($order_collection))
$this->errors[] = Tools::displayError('Invalid Order Reference');
$this->errors[] = Tools::displayError('Invalid order reference');
else if (!$order_collection->getFirst()->isAssociatedAtGuest($email))
$this->errors[] = Tools::displayError('Invalid Order Reference');
$this->errors[] = Tools::displayError('Invalid order reference');
else
{
$this->assignOrderTracking($order_collection);
@@ -99,10 +99,10 @@ class GuestTrackingControllerCore extends FrontController
if (!Validate::isLoadedObject($customer))
$this->errors[] = Tools::displayError('Invalid customer');
else if (!Tools::getValue('password'))
$this->errors[] = Tools::displayError('Invalid password');
$this->errors[] = Tools::displayError('Invalid password.');
else if (!$customer->transformToCustomer($this->context->language->id, Tools::getValue('password')))
// @todo clarify error message
$this->errors[] = Tools::displayError('An error occurred while transforming guest to customer.');
$this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.');
else
$this->context->smarty->assign('transformSuccess', true);
}