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 09afe53452
commit 77efe4c04e
590 changed files with 6160 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminGroupsController.php
+6 -6
View File
@@ -359,7 +359,7 @@ class AdminGroupsControllerCore extends AdminController
public function processSave()
{
if (!$this->validateDiscount(Tools::getValue('reduction')))
$this->errors[] = Tools::displayError('Discount value is incorrect (must be a percentage)');
$this->errors[] = Tools::displayError('The discount value is incorrect (must be a percentage).');
else
{
$this->updateCategoryReduction();
@@ -390,7 +390,7 @@ class AdminGroupsControllerCore extends AdminController
}
else if (!$this->validateDiscount($category_reduction))
{
$result['errors'][] = Tools::displayError('Discount value is incorrect (must be a percentage)');
$result['errors'][] = Tools::displayError('The discount value is incorrect (must be a percentage).');
$result['hasError'] = true;
}
else
@@ -435,7 +435,7 @@ class AdminGroupsControllerCore extends AdminController
foreach ($category_reduction as $cat => $reduction)
{
if (!Validate::isUnsignedId($cat) || !$this->validateDiscount($reduction))
$this->errors[] = Tools::displayError('Discount value is incorrect');
$this->errors[] = Tools::displayError('The discount value is incorrect.');
else
{
$category = new Category((int)$cat);
@@ -445,7 +445,7 @@ class AdminGroupsControllerCore extends AdminController
$group_reduction->reduction = (float)($reduction / 100);
$group_reduction->id_category = (int)$cat;
if (!$group_reduction->save())
$this->errors[] = Tools::displayError('Cannot save group reductions');
$this->errors[] = Tools::displayError('You cannot save group reductions.');
}
}
}
@@ -458,10 +458,10 @@ class AdminGroupsControllerCore extends AdminController
{
$group = new Group($this->id_object);
if (!Validate::isLoadedObject($group))
$this->errors[] = Tools::displayError('An error occurred while updating group.');
$this->errors[] = Tools::displayError('An error occurred while updating this group.');
$update = Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'group` SET show_prices = '.($group->show_prices ? 0 : 1).' WHERE `id_group` = '.(int)$group->id);
if (!$update)
$this->errors[] = Tools::displayError('An error occurred while updating group.');
$this->errors[] = Tools::displayError('An error occurred while updating this group.');
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
}