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/AdminStatusesController.php
+7 -7
View File
@@ -187,7 +187,7 @@ class AdminStatusesControllerCore extends AdminController
else
$helper->fields_value = $this->getFieldsValue($order_return_state);
$helper->toolbar_btn = $this->toolbar_btn;
$helper->title = $this->l('Edit Order Statuses');
$helper->title = $this->l('Edit Order Status');
return $helper;
}
@@ -206,7 +206,7 @@ class AdminStatusesControllerCore extends AdminController
// call postProcess() to take care of actions and filters
$this->postProcess();
$this->toolbar_title = $this->l('Return statuses');
$this->toolbar_title = $this->l('Return status');
$this->checkFilterForOrdersReturnsList();
parent::initToolbar();
@@ -242,7 +242,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_form = array(
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order statuses'),
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
),
'input' => array(
@@ -296,7 +296,7 @@ class AdminStatusesControllerCore extends AdminController
'name' => 'hidden',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Hide this state in order for customer'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Hide this state in all customer orders'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -389,7 +389,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_form[0]['form'] = array(
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order statuses'),
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
),
'input' => array(
@@ -455,7 +455,7 @@ class AdminStatusesControllerCore extends AdminController
// Update object
if (!$order_return_state->save())
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current order return state');
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current order\'s return state.');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
}
@@ -476,7 +476,7 @@ class AdminStatusesControllerCore extends AdminController
$order_return_state = new OrderReturnState((int)$id_order_return_state);
if (!$order_return_state->delete())
$this->errors[] = Tools::displayError('An error has occurred: Can\'t delete the current order return state');
$this->errors[] = Tools::displayError('An error has occurred: Can\'t delete the current order\'s return state.');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=1&token='.$this->token);
}