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

[*] TR : update English translations key for Errors

Browse Source
This commit is contained in:
lLefevre
2012-07-12 10:14:41 +00:00
parent 46b391114b
commit f30f3e258b
17 changed files with 64 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAddressesController.php
+3 -3
View File
@@ -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.').'<br />'.
$this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.').'<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[] = 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)
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -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);
}
}
}
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -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')))
controllers/admin/AdminRequestSqlController.php
+2 -2
View File
@@ -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;
}
}
controllers/admin/AdminStoresController.php
+3 -3
View File
@@ -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.').'<br />'.Tools::displayError('Must be typed as follows:').' '.
$this->errors[] = Tools::displayError('Your Postal Code/Zip Code is incorrect.').'<br />'.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 */
controllers/admin/AdminTaxRulesGroupController.php
+1 -1
View File
@@ -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)))
);
}
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -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()
controllers/front/AddressController.php
+3 -3
View File
@@ -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)))
);
}
controllers/front/AuthController.php
+3 -3
View File
@@ -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'))))
controllers/front/GetFileController.php
+1 -1
View File
@@ -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.'));
?>
<script type="text/javascript">
controllers/front/GuestTrackingController.php
+1 -1
View File
@@ -64,7 +64,7 @@ class GuestTrackingControllerCore extends FrontController
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 log-in 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 (!Validate::isLoadedObject($order))