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/admin/AdminShippingController.php
+3 -3
View File
@@ -185,15 +185,15 @@ class AdminShippingControllerCore extends AdminController
Tools::redirectAdmin(self::$currentIndex.'&conf=6&id_carrier='.$carrier->id.'&token='.$this->token);
}
else
$this->errors[] = Tools::displayError('An error occurred while updating fees (cannot load carrier object).');
$this->errors[] = Tools::displayError('An error occurred while attempting to update fees (cannot load carrier object).');
}
elseif (isset($id_carrier2))
$_POST['id_carrier'] = $id_carrier2;
else
$this->errors[] = Tools::displayError('An error occurred while updating fees (cannot load carrier object).');
$this->errors[] = Tools::displayError('An error occurred while attempting to update fees (cannot load carrier object).');
}
else
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
$this->errors[] = Tools::displayError('You do not have permission to edit this.');
}
else
return parent::postProcess();