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
modules/carriercompare/carriercompare.php
+6 -6
View File
@@ -42,8 +42,8 @@ class CarrierCompare extends Module
parent::__construct();
$this->displayName = $this->l('Shipping Estimation');
$this->description = $this->l('Module to compare carrier possibilities before using the checkout process');
$this->displayName = $this->l('Shipping Estimate');
$this->description = $this->l('Compares carrier choices before checkout.');
$this->template_directory = dirname(__FILE__).'/template/';
$this->initRetroCompatibilityVar();
}
@@ -202,13 +202,13 @@ class CarrierCompare extends Module
$errors = array();
if (!Validate::isInt($id_state))
$errors[] = $this->l('Invalid state ID');
$errors[] = $this->l('Invalid State ID');
if ($id_state != 0 && !Validate::isLoadedObject(new State($id_state)))
$errors[] = $this->l('Please select a state');
if (!Validate::isInt($id_country) || !Validate::isLoadedObject(new Country($id_country)))
$errors[] = $this->l('Please select a country');
if (!$this->checkZipcode($zipcode, $id_country))
$errors[] = $this->l('Please use a valid zip/postal code depending on your country selection');
$errors[] = $this->l('Depending on your country selection, please use a valid zip/postal code.');
if (!Validate::isInt($id_carrier) || !Validate::isLoadedObject(new Carrier($id_carrier)))
$errors[] = $this->l('Please select a carrier');
@@ -219,7 +219,7 @@ class CarrierCompare extends Module
foreach (self::getCarriersListByIdZone($id_country, $id_state, $zipcode) as $carrier)
$ids_carrier[] = $carrier['id_carrier'];
if (!in_array($id_carrier, $ids_carrier))
$errors[] = $this->l('This carrier ID isn\'t available for your selection');
$errors[] = $this->l('The carrier ID isn\'t available for your selection');
if (sizeof($errors))
return $errors;
@@ -238,7 +238,7 @@ class CarrierCompare extends Module
$this->context->cart->setDeliveryOption(array($id_address => $id_carrier));
if (!$this->context->cart->update())
return array($this->l('Cannot update the cart'));
return array($this->l('Cannot update the shopping cart.'));
return array();
}