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

// Fix update english key of translations in all files

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-03-14 12:25:51 +00:00
parent b217bc4ad8
commit 0e9e23aaae
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressController.php
+4 -4
View File
@@ -158,14 +158,14 @@ class AddressControllerCore extends FrontController
$zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp);
$zip_regexp = str_replace('C', $country->iso_code, $zip_regexp);
if (!preg_match($zip_regexp, $postcode))
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '
.Tools::displayError('is invalid.').'<br />'.Tools::displayError('Must be typed as follows:')
.' '.str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
}
else if ($zip_code_format)
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '.Tools::displayError('is required.');
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '.Tools::displayError('is required.');
else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode))
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '.Tools::displayError('is invalid.')
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '.Tools::displayError('is invalid.')
.'<br />'.Tools::displayError('Must be typed as follows:').' '
.str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
}
@@ -186,7 +186,7 @@ class AddressControllerCore extends FrontController
AND id_address != '.(int)Tools::getValue('id_address').'
AND id_customer = '.(int)$this->context->customer->id.'
AND deleted = 0') > 0)
$this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose an other one.'), Tools::safeOutput($_POST['alias']));
$this->errors[] = sprintf(Tools::displayError('The alias \\"%s\\" is already used, please chose another one.'), Tools::safeOutput($_POST['alias']));
// Don't continue this process if we have errors !
if ($this->errors && !Tools::isSubmit('ajax'))
controllers/front/AuthController.php
+7 -7
View File
@@ -402,7 +402,7 @@ class AuthControllerCore extends FrontController
// we add the customer in the default customer group
$customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
if (!$this->sendConfirmationMail($customer))
$this->errors[] = Tools::displayError('Cannot send email');
$this->errors[] = Tools::displayError('Cannot send e-mail');
}
else
{
@@ -473,12 +473,12 @@ class AuthControllerCore extends FrontController
$zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp);
$zip_regexp = str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), $zip_regexp);
if (!preg_match($zip_regexp, $postcode))
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '.Tools::displayError('is invalid.').'<br />'.Tools::displayError('Must be typed as follows:').' '.str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '.Tools::displayError('is invalid.').'<br />'.Tools::displayError('Must be typed as follows:').' '.str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
}
elseif ($zip_code_format)
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '.Tools::displayError('is required.');
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '.Tools::displayError('is required.');
elseif ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode))
$this->errors[] = '<strong>'.Tools::displayError('Zip/ Postal code').'</strong> '.Tools::displayError('is invalid.');
$this->errors[] = '<strong>'.Tools::displayError('Zip / Postal code').'</strong> '.Tools::displayError('is invalid.');
}
if (Country::isNeedDniByCountryId($address->id_country) && (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))))
@@ -493,7 +493,7 @@ class AuthControllerCore extends FrontController
if (!count($this->errors))
{
if (Customer::customerExists(Tools::getValue('email')))
$this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.', false);
$this->errors[] = Tools::displayError('An account is already registered with this e-mail, please enter your password or request a new one.', false);
if (Tools::isSubmit('newsletter'))
{
$customer->ip_registration_newsletter = pSQL(Tools::getRemoteAddr());
@@ -535,7 +535,7 @@ class AuthControllerCore extends FrontController
// we add the guest customer in the default customer group
$customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
if (!$this->sendConfirmationMail($customer))
$this->errors[] = Tools::displayError('Cannot send email');
$this->errors[] = Tools::displayError('Cannot send e-mail');
}
else
{
@@ -611,7 +611,7 @@ class AuthControllerCore extends FrontController
$this->errors[] = Tools::displayError('Invalid e-mail address');
elseif (Customer::customerExists($email))
{
$this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.', false);
$this->errors[] = Tools::displayError('An account is already registered with this e-mail, please enter your password or request a new one.', false);
$_POST['email'] = $_POST['email_create'];
unset($_POST['email_create']);
}
controllers/front/ContactController.php
+1 -1
View File
@@ -55,7 +55,7 @@ class ContactControllerCore extends FrontController
else if (!Validate::isCleanHtml($message))
$this->errors[] = Tools::displayError('Invalid message');
else if (!($id_contact = (int)(Tools::getValue('id_contact'))) || !(Validate::isLoadedObject($contact = new Contact($id_contact, $this->context->language->id))))
$this->errors[] = Tools::displayError('Please select a subject on the list.');
$this->errors[] = Tools::displayError('Please select a subject from the list.');
else if (!empty($_FILES['fileUpload']['name']) && $_FILES['fileUpload']['error'] != 0)
$this->errors[] = Tools::displayError('An error occurred during the file upload');
else if (!empty($_FILES['fileUpload']['name']) && !in_array(substr($_FILES['fileUpload']['name'], -4), $extension) && !in_array(substr($_FILES['fileUpload']['name'], -5), $extension))
controllers/front/GetFileController.php
+1 -1
View File
@@ -95,7 +95,7 @@ class GetFileControllerCore extends FrontController
$customer_deadline = strtotime($info['date_expiration']);
if ($now > $customer_deadline && $info['date_expiration'] != '0000-00-00 00:00:00')
$this->displayCustomError('Expiration date exceeded');
$this->displayCustomError('Expiration date has passed, you cannot download this product');
if ($info['download_nb'] >= $info['nb_downloadable'] && $info['nb_downloadable'])
$this->displayCustomError('You have reached the maximum number of allowed downloads.');
controllers/front/OrderController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class OrderControllerCore extends ParentOrderController
if (!$this->context->cart->checkQuantities())
{
$this->step = 0;
$this->errors[] = Tools::displayError('An item in your cart is no longer available for this quantity, you cannot proceed with your order.');
$this->errors[] = Tools::displayError('An item in your cart is no longer available in this quantity, you cannot proceed with your order.');
}
// Check minimal amount
controllers/front/OrderOpcController.php
+4 -4
View File
@@ -83,7 +83,7 @@ class OrderOpcControllerCore extends ParentOrderController
die(Tools::jsonEncode($return));
}
else
$this->errors[] = Tools::displayError('Error occurred updating cart.');
$this->errors[] = Tools::displayError('Error occurred while updating cart.');
if (count($this->errors))
die('{"hasError" : true, "errors" : ["'.implode('\',\'', $this->errors).'"]}');
exit;
@@ -296,7 +296,7 @@ class OrderOpcControllerCore extends ParentOrderController
'sl_country' => isset($selectedCountry) ? $selectedCountry : 0,
'PS_GUEST_CHECKOUT_ENABLED' => Configuration::get('PS_GUEST_CHECKOUT_ENABLED'),
'errorCarrier' => Tools::displayError('You must choose a carrier before', false),
'errorTOS' => Tools::displayError('You must accept terms of service before', false),
'errorTOS' => Tools::displayError('You must accept the Terms of Service before', false),
'isPaymentStep' => (bool)(isset($_GET['isPaymentStep']) && $_GET['isPaymentStep']),
'genders' => Gender::getGenders(),
));
@@ -402,7 +402,7 @@ class OrderOpcControllerCore extends ParentOrderController
if (!$this->isLogged)
return '<p class="warning">'.Tools::displayError('Please sign in to see payment methods').'</p>';
if ($this->context->cart->OrderExists())
return '<p class="warning">'.Tools::displayError('Error: this order is already validated').'</p>';
return '<p class="warning">'.Tools::displayError('Error: this order has already been validated').'</p>';
if (!$this->context->cart->id_customer || !Customer::customerIdExistsStatic($this->context->cart->id_customer) || Customer::isBanned($this->context->cart->id_customer))
return '<p class="warning">'.Tools::displayError('Error: no customer').'</p>';
$address_delivery = new Address($this->context->cart->id_address_delivery);
@@ -421,7 +421,7 @@ class OrderOpcControllerCore extends ParentOrderController
if (!$this->context->cart->id_currency)
return '<p class="warning">'.Tools::displayError('Error: no currency has been selected').'</p>';
if (!$this->context->cookie->checkedTOS && Configuration::get('PS_CONDITIONS'))
return '<p class="warning">'.Tools::displayError('Please accept Terms of Service').'</p>';
return '<p class="warning">'.Tools::displayError('Please accept the Terms of Service').'</p>';
/* If some products have disappear */
if (!$this->context->cart->checkQuantities())
controllers/front/ParentOrderController.php
+2 -2
View File
@@ -75,7 +75,7 @@ class ParentOrderControllerCore extends FrontController
if (!$duplication || !Validate::isLoadedObject($duplication['cart']))
$this->errors[] = Tools::displayError('Sorry, we cannot renew your order.');
else if (!$duplication['success'])
$this->errors[] = Tools::displayError('Missing items - we are unable to renew your order');
$this->errors[] = Tools::displayError('Some items are not available, we are unable to renew your order');
else
{
$this->context->cookie->id_cart = $duplication['cart']->id;
@@ -212,7 +212,7 @@ class ParentOrderControllerCore extends FrontController
{
$address = new Address((int)($this->context->cart->id_address_delivery));
if (!($id_zone = Address::getZoneById($address->id)))
$this->errors[] = Tools::displayError('No zone match with your address');
$this->errors[] = Tools::displayError('No zone matches your address');
}
else
$id_zone = Country::getIdZone((int)Configuration::get('PS_COUNTRY_DEFAULT'));
controllers/front/PasswordController.php
+2 -2
View File
@@ -61,7 +61,7 @@ class PasswordControllerCore extends FrontController
$customer->firstname.' '.$customer->lastname))
$this->context->smarty->assign(array('confirmation' => 2, 'email' => $customer->email));
else
$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
$this->errors[] = Tools::displayError('Error occurred while sending the e-mail.');
}
}
}
@@ -92,7 +92,7 @@ class PasswordControllerCore extends FrontController
$customer->firstname.' '.$customer->lastname))
$this->context->smarty->assign(array('confirmation' => 1, 'email' => $customer->email));
else
$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
$this->errors[] = Tools::displayError('Error occurred while sending the e-mail.');
}
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.');
controllers/front/StoresController.php
+1 -1
View File
@@ -39,7 +39,7 @@ class StoresControllerCore extends FrontController
if (!extension_loaded('Dom'))
{
$this->errors[] = Tools::displayError('Dom extension is not loaded.');
$this->errors[] = Tools::displayError('PHP \\"Dom\\" extension is not loaded.');
$this->context->smarty->assign('errors', $this->errors);
}
}