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/AdminCustomersController.php
+18 -18
View File
@@ -82,7 +82,7 @@ class AdminCustomersControllerCore extends AdminController
'width' => 20
),
'id_gender' => array(
'title' => $this->l('Titles'),
'title' => $this->l('Title'),
'width' => 70,
'align' => 'center',
'icon' => $genders_icon,
@@ -92,7 +92,7 @@ class AdminCustomersControllerCore extends AdminController
'filter_key' => 'a!id_gender',
),
'lastname' => array(
'title' => $this->l('Last Name'),
'title' => $this->l('Last name'),
'width' => 'auto'
),
'firstname' => array(
@@ -205,21 +205,21 @@ class AdminCustomersControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
$this->action = 'guest_to_customer';
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.');
}
elseif (Tools::isSubmit('changeNewsletterVal') && $this->id_object)
{
if ($this->tabAccess['edit'] === '1')
$this->action = 'change_newsletter_val';
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.');
}
elseif (Tools::isSubmit('changeOptinVal') && $this->id_object)
{
if ($this->tabAccess['edit'] === '1')
$this->action = 'change_optin_val';
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.');
}
// When deleting, first display a form to select the type of deletion
@@ -269,7 +269,7 @@ class AdminCustomersControllerCore extends AdminController
'input' => array(
array(
'type' => 'radio',
'label' => $this->l('Titles:'),
'label' => $this->l('Title:'),
'name' => 'id_gender',
'required' => false,
'class' => 't',
@@ -470,7 +470,7 @@ class AdminCustomersControllerCore extends AdminController
);
$this->fields_form['input'][] = array(
'type' => 'text',
'label' => $this->l('Max payment days:'),
'label' => $this->l('Maximum number of payment days:'),
'name' => 'max_payment_days',
'size' => 10,
'hint' => $this->l('Valid characters:').' 0-9'
@@ -584,7 +584,7 @@ class AdminCustomersControllerCore extends AdminController
foreach ($orders as $order)
{
if (!isset($order['order_state']))
$order['order_state'] = $this->l('The state isn\'t still defined for this order');
$order['order_state'] = $this->l('The state isn\'t defined for this order');
if ($order['valid'])
{
@@ -752,7 +752,7 @@ class AdminCustomersControllerCore extends AdminController
$customer->getByEmail($customer_email);
if ($customer->id)
{
$this->errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$customer_email;
$this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$customer_email;
$this->display = 'edit';
return $customer;
}
@@ -776,13 +776,13 @@ class AdminCustomersControllerCore extends AdminController
$customer = new Customer();
$customer->getByEmail($customer_email);
if ($customer->id)
$this->errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$customer_email;
$this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$customer_email;
}
return parent::processUpdate();
}
else
$this->errors[] = Tools::displayError('An error occurred while loading object.').'
$this->errors[] = Tools::displayError('An error occurred while loading the object.').'
<b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
}
@@ -790,7 +790,7 @@ class AdminCustomersControllerCore extends AdminController
{
// Check that default group is selected
if (!is_array(Tools::getValue('groupBox')) || !in_array(Tools::getValue('id_default_group'), Tools::getValue('groupBox')))
$this->errors[] = Tools::displayError('Default customer group must be selected in group box.');
$this->errors[] = Tools::displayError('A default customer group must be selected in group box.');
// Check the requires fields which are settings in the BO
$customer = new Customer();
@@ -824,7 +824,7 @@ class AdminCustomersControllerCore extends AdminController
else if ($customer->transformToCustomer(Tools::getValue('id_lang', $this->context->language->id)))
Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'='.$customer->id.'&conf=3&token='.$this->token);
else
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
$this->errors[] = Tools::displayError('An error occurred while updating customer information.');
}
/**
@@ -834,10 +834,10 @@ class AdminCustomersControllerCore extends AdminController
{
$customer = new Customer($this->id_object);
if (!Validate::isLoadedObject($customer))
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
$this->errors[] = Tools::displayError('An error occurred while updating customer information.');
$customer->newsletter = $customer->newsletter ? 0 : 1;
if (!$customer->update())
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
$this->errors[] = Tools::displayError('An error occurred while updating customer information.');
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
}
@@ -848,10 +848,10 @@ class AdminCustomersControllerCore extends AdminController
{
$customer = new Customer($this->id_object);
if (!Validate::isLoadedObject($customer))
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
$this->errors[] = Tools::displayError('An error occurred while updating customer information.');
$customer->optin = $customer->optin ? 0 : 1;
if (!$customer->update())
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
$this->errors[] = Tools::displayError('An error occurred while updating customer information.');
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
}
@@ -887,7 +887,7 @@ class AdminCustomersControllerCore extends AdminController
$tpl->assign(array(
'href' => self::$currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token),
'confirm' => $this->l('Delete selected item?').$name,
'confirm' => $this->l('Delete the selected item?').$name,
'action' => $this->l('Delete'),
'id' => $id,
));