diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index e82ce4364..1d4928024 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -545,7 +545,7 @@ class AdminControllerCore extends Controller Tools::displayError('You cannot delete all of the items.'); } elseif (array_key_exists('delete', $this->list_skip_actions) && in_array($object->id, $this->list_skip_actions['delete'])) //check if some ids are in list_skip_actions and forbid deletion - $this->errors[] = Tools::displayError('You cannot delete this items.'); + $this->errors[] = Tools::displayError('You cannot delete this item.'); else { if ($this->deleted) diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 82c52dfd8..46679ac79 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -350,14 +350,14 @@ class AdminAddressesControllerCore extends AdminController $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[] = Tools::displayError('Your Postcode / Zip code code is incorrect.').'
'. + $this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.').'
'. 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[] = Tools::displayError('Postcode / Zip code required.'); + $this->errors[] = Tools::displayError('Postal Code/Zip Code required.'); else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) - $this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.'); + $this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.'); } /* If this address come from order's edition and is the same as the other one (invoice or delivery one) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index efb9346bf..0194ae68b 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1359,7 +1359,7 @@ class AdminImportControllerCore extends AdminController if ($error) { - $this->warnings[] = sprintf(Tools::displayError('Product n°%1$d : the picture cannot be saved : %2$s'), $image->id_product, $url); + $this->warnings[] = sprintf(Tools::displayError('Product n°%1$d: the picture cannot be saved: %2$s'), $image->id_product, $url); } } } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 2e80d6cc1..97e6a03cf 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -385,7 +385,7 @@ class AdminOrdersControllerCore extends AdminController $this->errors[] = sprintf(Tools::displayError('field %s is required.'), $field); foreach ($rules['size'] as $field => $maxLength) if (Tools::getValue($field) && Tools::strlen(Tools::getValue($field)) > $maxLength) - $this->errors[] = sprintf(Tools::displayError('field %1$s is too long. (%2$d chars max)'), $field, $maxLength); + $this->errors[] = sprintf(Tools::displayError('field %1$s is too long (%2$d chars max).'), $field, $maxLength); foreach ($rules['validate'] as $field => $function) if (Tools::getValue($field)) if (!Validate::$function(htmlentities(Tools::getValue($field), ENT_COMPAT, 'UTF-8'))) diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index a75e591eb..e7d5b688c 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -452,7 +452,7 @@ class AdminRequestSqlControllerCore extends AdminController $e[$key]['attribut'][1] ); else - $this->errors[] = Tools::displayError('When multiple tables are used, each attribute must be referenced to a table.'); + $this->errors[] = Tools::displayError('When multiple tables are used, each attribute must refer to a table.'); break; case 'testedRequired': @@ -460,7 +460,7 @@ class AdminRequestSqlControllerCore extends AdminController break; case 'testedUnauthorized': - $this->errors[] = sprintf(Tools::displayError('is a unauthorized keyword.'), $e[$key]); + $this->errors[] = sprintf(Tools::displayError('is an unauthorized keyword.'), $e[$key]); break; } } diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 67560b141..b1ae30b4d 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -367,7 +367,7 @@ class AdminStoresControllerCore extends AdminController $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[] = Tools::displayError('Your Postcode / Zip code code is incorrect.').'
'.Tools::displayError('Must be typed as follows:').' '. + $this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.').'
'.Tools::displayError('Must be typed as follows:').' '. str_replace( 'C', $country->iso_code, @@ -383,9 +383,9 @@ class AdminStoresControllerCore extends AdminController ); } else if ($zip_code_format) - $this->errors[] = Tools::displayError('Postcode / Zip code required.'); + $this->errors[] = Tools::displayError('Postal Code/Zip Code required.'); else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) - $this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.'); + $this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.'); } /* Store hours */ diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index ff0a335cc..0fdd4ab1e 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -421,7 +421,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController if (!$country->checkZipCode($zip_code)) { $this->errors[] = sprintf( - Tools::displayError('Zip / Postal code is invalid. Must be typed as follows: %s'), + Tools::displayError('Zip/Postal code is invalid. Must be typed as follows: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))) ); } diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index a97f9cf15..a771739ab 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -307,7 +307,7 @@ class AdminTranslationsControllerCore extends AdminController $this->redirect(); } else - throw new PrestaShopException(sprintf(Tools::displayError('Cannot write this file : "%s"'), $file_path)); + throw new PrestaShopException(sprintf(Tools::displayError('Cannot write this file: "%s"'), $file_path)); } public function submitCopyLang() diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index b079e21ea..2a128a206 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -151,15 +151,15 @@ class AddressControllerCore extends FrontController { if (!$country->checkZipCode($postcode)) $this->errors[] = sprintf( - Tools::displayError('Zip / Postal code is invalid. Must be typed as follows: %s'), + Tools::displayError('Zip/Postal code is invalid. Must be typed as follows: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))) ); } else if ($zip_code_format) - $this->errors[] = Tools::displayError('Zip / Postal code is required.'); + $this->errors[] = Tools::displayError('Zip/Postal code is required.'); else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) $this->errors[] = sprintf( - Tools::displayError('Zip / Postal code is invalid. Must be typed as follows: %s'), + Tools::displayError('Zip/Postal code is invalid. Must be typed as follows: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))) ); } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index eed158a60..efc1d5cbc 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -483,14 +483,14 @@ class AuthControllerCore extends FrontController { if (!$country->checkZipCode($postcode)) $this->errors[] = sprintf( - Tools::displayError('Zip / Postal code is invalid. Must be typed as follows: %s'), + Tools::displayError('Zip/Postal code is invalid. Must be typed as follows: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))) ); } elseif ($country->zip_code_format) - $this->errors[] = Tools::displayError('Zip / Postal code is required.'); + $this->errors[] = Tools::displayError('Zip/Postal code is required.'); elseif ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) - $this->errors[] = Tools::displayError('Zip / Postal code is invalid.'); + $this->errors[] = Tools::displayError('Zip/Postal code is invalid.'); } if ($country->need_identification_number && (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni')))) diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php index 590aadc99..394c69af1 100644 --- a/controllers/front/GetFileController.php +++ b/controllers/front/GetFileController.php @@ -297,7 +297,7 @@ class GetFileControllerCore extends FrontController 'This file no longer exists.' => Tools::displayError('This file no longer exists.'), 'This product has been refunded.' => Tools::displayError('This product has been refunded.'), 'The product deadline is in the past.' => Tools::displayError('The product deadline is in the past.'), - 'Expiration date exceeded' => Tools::displayError('Expiration date exceeded'), + 'Expiration date exceeded' => Tools::displayError('Expiration date has passed, you cannot download this product'), 'You have reached the maximum number of allowed downloads.' => Tools::displayError('You have reached the maximum number of allowed downloads.')); ?>