// Fix update english key of translations in all files
This commit is contained in:
lLefevre
@@ -126,7 +126,7 @@ class AdminAccountingExportControllerCore extends AdminController
|
||||
if (!is_writeable($this->downloadDir))
|
||||
$this->errors[] = $this->l('The download folder doesn\'t have the sufficient right');
|
||||
if (!($this->fd = fopen($this->downloadFile, 'w+')))
|
||||
$this->errors[] = $this->l('The file can\'t be opened or created, please check the right');
|
||||
$this->errors[] = $this->l('The file can\'t be opened or created, please check the rights');
|
||||
@chmod($this->downloadFile, 0777);
|
||||
}
|
||||
|
||||
@@ -288,7 +288,7 @@ class AdminAccountingExportControllerCore extends AdminController
|
||||
$buffer .= '"'.$val.'";';
|
||||
fwrite($this->fd, mb_convert_encoding(rtrim($buffer, ';')."\r\n", 'UTF-16LE'));
|
||||
}
|
||||
$this->confirmations[] = $this->l('Export has been successfully done');
|
||||
$this->confirmations[] = $this->l('Export has been successfully completed');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -44,11 +44,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
|
||||
'table' => 'accounting_product_zone_shop',
|
||||
'fields' => array(
|
||||
'p.account_number' => $this->l('Account number'),
|
||||
'COUNT(*) AS total' => $this->l('Number of product associated to this account')
|
||||
'COUNT(*) AS total' => $this->l('Number of products associated with this account')
|
||||
),
|
||||
'group_by' => 'account_number',
|
||||
'condition' => 'p.account_number <> "" AND account_number IS NOT NULL',
|
||||
'title' => $this->l('Product account number list'),
|
||||
'title' => $this->l('Product account numbers'),
|
||||
'list' => array()),
|
||||
|
||||
// Taxes definition
|
||||
@@ -56,11 +56,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
|
||||
'table' => 'tax',
|
||||
'fields' => array(
|
||||
'account_number' => $this->l('Account number'),
|
||||
'COUNT(*) AS total' => $this->l('Number of taxes associated to this account')
|
||||
'COUNT(*) AS total' => $this->l('Number of taxes associated with this account')
|
||||
),
|
||||
'group_by' => 'account_number',
|
||||
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
|
||||
'title' => $this->l('Taxes Account number list'),
|
||||
'title' => $this->l('Tax account numbers'),
|
||||
'list' => array()),
|
||||
|
||||
// Gift wrapping definition
|
||||
@@ -69,9 +69,9 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
|
||||
'key' => 'account_gift_wripping',
|
||||
'fields' => array(
|
||||
'account_number' => $this->l('Account number'),
|
||||
'total' => $this->l('Number of gift-wrapping associated to this account')
|
||||
'total' => $this->l('Number of gift-wrapping options associated with this account')
|
||||
),
|
||||
'title' => $this->l('Gift wrapping account number list'),
|
||||
'title' => $this->l('Gift-wrapping account numbers'),
|
||||
'list' => array()),
|
||||
|
||||
// Submited shipping charge definition
|
||||
@@ -106,7 +106,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
|
||||
),
|
||||
'group_by' => 'account_number',
|
||||
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
|
||||
'title' => $this->l('Customer account number list'),
|
||||
'title' => $this->l('Customer account numbers'),
|
||||
'list' => array()),
|
||||
|
||||
// Zone shop definition
|
||||
@@ -114,11 +114,11 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
|
||||
'table' => 'accounting_zone_shop',
|
||||
'fields' => array(
|
||||
'p.account_number' => $this->l('Account number'),
|
||||
'COUNT(*) AS total' => $this->l('Number of zone associated to this account')
|
||||
'COUNT(*) AS total' => $this->l('Number of zones associated with this account')
|
||||
),
|
||||
'group_by' => 'account_number',
|
||||
'condition' => 'account_number <> "" AND account_number IS NOT NULL',
|
||||
'title' => $this->l('Zone shop account number list'),
|
||||
'title' => $this->l('Zone shop account numbers'),
|
||||
'list' => array())
|
||||
);
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ class AdminAddressesControllerCore extends AdminController
|
||||
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
|
||||
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
|
||||
'address1' => array('title' => $this->l('Address')),
|
||||
'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 80),
|
||||
'postcode' => array('title' => $this->l('Postcode / Zip Code'), 'align' => 'right', 'width' => 80),
|
||||
'city' => array('title' => $this->l('City'), 'width' => 150),
|
||||
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countries_array, 'filter_key' => 'cl!id_country'));
|
||||
|
||||
@@ -249,7 +249,7 @@ class AdminAddressesControllerCore extends AdminController
|
||||
{
|
||||
$temp_fields[] = array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Postcode/ Zip Code'),
|
||||
'label' => $this->l('Postcode / Zip Code'),
|
||||
'name' => 'postcode',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
@@ -348,14 +348,14 @@ class AdminAddressesControllerCore extends AdminController
|
||||
$zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp);
|
||||
$zip_regexp = str_replace('C', $country->iso_code, $zip_regexp);
|
||||
if (!preg_match($zip_regexp, $postcode))
|
||||
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.').'<br />'.
|
||||
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.').'<br />'.
|
||||
Tools::displayError('Must be typed as follows:').' '.
|
||||
str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $zip_code_format)));
|
||||
}
|
||||
else if ($zip_code_format)
|
||||
$this->errors[] = Tools::displayError('Postcode required.');
|
||||
$this->errors[] = Tools::displayError('Postcode / Zip code required.');
|
||||
else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode))
|
||||
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.');
|
||||
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.');
|
||||
}
|
||||
|
||||
/* If this address come from order's edition and is the same as the other one (invoice or delivery one)
|
||||
|
||||
@@ -98,7 +98,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
|
||||
'default' => '2'
|
||||
),
|
||||
'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
|
||||
'title' => $this->l('Limit upload file value'),
|
||||
'title' => $this->l('File value upload limit'),
|
||||
'desc' => $this->l('Define the limit upload for a downloadable product, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
|
||||
'validation' => 'isInt',
|
||||
'cast' => 'intval',
|
||||
@@ -107,7 +107,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
|
||||
'default' => '1'
|
||||
),
|
||||
'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
|
||||
'title' => $this->l('Limit upload image value'),
|
||||
'title' => $this->l('Image value upload limit'),
|
||||
'desc' => $this->l('Define the limit upload for an image, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
|
||||
'validation' => 'isInt',
|
||||
'cast' => 'intval',
|
||||
@@ -131,7 +131,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_HIDE_OPTIMIZATION_TIPS' => array(
|
||||
'title' => $this->l('Hide optimization tips'),
|
||||
'desc' => $this->l('Hide optimization tips on the back office homepage'),
|
||||
'desc' => $this->l('Hide optimization tips on the Back Office homepage'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -144,21 +144,21 @@ class AdminAdminPreferencesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_SHOW_NEW_ORDERS' => array(
|
||||
'title' => $this->l('Show notifications for new orders'),
|
||||
'desc' => $this->l('This will display notifications when new orders will be made on your shop'),
|
||||
'desc' => $this->l('This will display notifications when new orders are made on your shop'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_SHOW_NEW_CUSTOMERS' => array(
|
||||
'title' => $this->l('Show notifications for new customers'),
|
||||
'desc' => $this->l('This will display notifications when new customers will register on your shop'),
|
||||
'desc' => $this->l('This will display notifications when new customers register on your shop'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_SHOW_NEW_MESSAGES' => array(
|
||||
'title' => $this->l('Show notifications for new messages'),
|
||||
'desc' => $this->l('This will display notifications when new messages will be posted on your shop'),
|
||||
'desc' => $this->l('This will display notifications when new messages are posted on your shop'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -176,7 +176,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
|
||||
|
||||
if (Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE') > $max_size || Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE') > $max_size)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('The limit choosen is superior to the server\'s maximum upload file You need to improve the limit of your server.');
|
||||
$this->errors[] = Tools::displayError('The limit chosen is larger than the server\'s maximum upload limit. Please increase the limits of your server.');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -129,7 +129,7 @@ class AdminAttachmentsControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
@@ -167,10 +167,10 @@ class AdminAttachmentsControllerCore extends AdminController
|
||||
$max_post = (int)ini_get('post_max_size');
|
||||
$upload_mb = min($max_upload, $max_post);
|
||||
$this->errors[] = $this->l('the File').' <b>'.$_FILES['file']['name'].'</b> '.
|
||||
$this->l('exceeds the size allowed by the server. This limit is set to').' <b>'.$upload_mb.$this->l('Mb').'</b>';
|
||||
$this->l('exceeds the size allowed by the server. The limit is set to').' <b>'.$upload_mb.$this->l('MB').'</b>';
|
||||
}
|
||||
else if (!empty($_FILES['file']['tmp_name']))
|
||||
$this->errors[] = $this->l('No file or your file isn\'t uploadable, check your server configuration about the upload maximum size.');
|
||||
$this->errors[] = $this->l('No file or your file is not uploadable, please check your server configuration for the maximum upload size.');
|
||||
}
|
||||
$this->validateRules();
|
||||
}
|
||||
|
||||
@@ -223,9 +223,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
|
||||
{
|
||||
if (!Combination::isFeatureActive())
|
||||
{
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').'
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').'
|
||||
<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.
|
||||
$this->l('Performances').'</a>');
|
||||
$this->l('Performance').'</a>');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -212,7 +212,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('Term or phrase displayed to the customer')
|
||||
'desc' => $this->l('Group name displayed to the customer')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -310,7 +310,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
'label' => $this->l('Color:'),
|
||||
'name' => 'color',
|
||||
'size' => 33,
|
||||
'desc' => $this->l('HTML colors only (e.g.,').' "lightblue", "#CC6600")'
|
||||
'desc' => $this->l('HTML colors only (e.g.').' "lightblue", "#CC6600")'
|
||||
);
|
||||
|
||||
$this->fields_form['input'][] = array(
|
||||
@@ -423,7 +423,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
{
|
||||
if (!Combination::isFeatureActive())
|
||||
{
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').
|
||||
' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').
|
||||
'#featuresDetachables">'.$this->l('Performances').'</a>');
|
||||
return;
|
||||
|
||||
@@ -52,7 +52,7 @@ class AdminBackupControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_BACKUP_ALL' => array(
|
||||
'title' => $this->l('Ignore statistics tables:'),
|
||||
'desc' => $this->l('The following tables will NOT be backed up if you enable this option:').'
|
||||
'desc' => $this->l('If enabled, the following tables will NOT be backed up:').'
|
||||
<br />'._DB_PREFIX_.'connections, '._DB_PREFIX_.'connections_page, '._DB_PREFIX_.'connections_source, '.
|
||||
_DB_PREFIX_.'guest, '._DB_PREFIX_.'statssearch',
|
||||
'cast' => 'intval',
|
||||
@@ -60,7 +60,7 @@ class AdminBackupControllerCore extends AdminController
|
||||
),
|
||||
'PS_BACKUP_DROP_TABLE' => array(
|
||||
'title' => $this->l('Drop existing tables during import:'),
|
||||
'desc' => $this->l('Select this option to instruct the backup file to drop your tables prior to restoring the backed up data').
|
||||
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring the backed up data').
|
||||
'<br />(ie. "DROP TABLE IF EXISTS")',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -142,14 +142,14 @@ class AdminBackupControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
|
||||
// Test if the backup dir is writable
|
||||
if (!is_writable(_PS_ADMIN_DIR_.'/backups/'))
|
||||
$this->warnings[] = $this->l('"Backups" Directory in admin directory must be writeable (CHMOD 755 / 777)');
|
||||
$this->warnings[] = $this->l('\\"Backups\\" Directory in admin directory must be writeable (CHMOD 755 / 777)');
|
||||
|
||||
if ($this->display == 'add' && is_writable(_PS_ADMIN_DIR_.'/backups/'))
|
||||
{
|
||||
@@ -218,7 +218,7 @@ class AdminBackupControllerCore extends AdminController
|
||||
$dh = @opendir(_PS_ADMIN_DIR_.'/backups/');
|
||||
if ($dh === false)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('Unable to open backup directory .').addslashes(_PS_ADMIN_DIR_.'/backups/').'"';
|
||||
$this->errors[] = Tools::displayError('Unable to open backup directory.').addslashes(_PS_ADMIN_DIR_.'/backups/').'"';
|
||||
return;
|
||||
}
|
||||
while (($file = readdir($dh)) !== false)
|
||||
|
||||
@@ -83,7 +83,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'width' => 25
|
||||
),
|
||||
'is_free' => array(
|
||||
'title' => $this->l('Is Free'),
|
||||
'title' => $this->l('Free Shipping'),
|
||||
'align' => 'center',
|
||||
'icon' => array(
|
||||
0 => 'disabled.gif',
|
||||
@@ -119,23 +119,23 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_CARRIER_DEFAULT' => array(
|
||||
'title' => $this->l('Default carrier:'),
|
||||
'desc' => $this->l('The default carrier used in shop'),
|
||||
'desc' => $this->l('Your shop\'s default carrier'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'id_carrier',
|
||||
'list' => Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)
|
||||
),
|
||||
'PS_CARRIER_DEFAULT_SORT' => array(
|
||||
'title' => $this->l('Carrier default sort:'),
|
||||
'desc' => $this->l('This default sort will be available only on front-office'),
|
||||
'title' => $this->l('Sort by:'),
|
||||
'desc' => $this->l('This will only be visible in the Front Office'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'value',
|
||||
'list' => $carrier_default_sort
|
||||
),
|
||||
'PS_CARRIER_DEFAULT_ORDER' => array(
|
||||
'title' => $this->l('Carrier default order:'),
|
||||
'desc' => $this->l('This default order will be available only on front-office'),
|
||||
'title' => $this->l('Order by:'),
|
||||
'desc' => $this->l('This will only be visible in the Front Office'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'value',
|
||||
@@ -152,28 +152,28 @@ class AdminCarriersControllerCore extends AdminController
|
||||
public function renderList()
|
||||
{
|
||||
$this->displayInformation(
|
||||
' <b>'.$this->l('How to create a new carrier?').'</b>
|
||||
' <b>'.$this->l('How do I create a new carrier?').'</b>
|
||||
<br />
|
||||
<ul>
|
||||
<li>'.$this->l('Click "Add new".').'<br /></li>
|
||||
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
|
||||
<li>'.$this->l('Click \\"Add new.\\"').'<br /></li>
|
||||
<li>'.$this->l('Fill in the fields and click \\"Save.\\"').'</li>
|
||||
<li>'.
|
||||
$this->l('You need to decide a price range or a weight range for which the new carrier will be available.').' '.
|
||||
$this->l('Under the "Shipping" tab, click either "Price Ranges" or "Weight Ranges".').'
|
||||
$this->l('You need to set a price range or a weight range for which the new carrier will be available.').' '.
|
||||
$this->l('Under the \\"Shipping\\" tab, click either \\"Price Ranges\\" or \\"Weight Ranges.\\"').'
|
||||
</li>
|
||||
<li>'.$this->l('Click "Add new".').'</li>
|
||||
<li>'.$this->l('Click \\"Add new.\\"').'</li>
|
||||
<li>'.
|
||||
$this->l('Select the name of the carrier and define the price range or the weight range.').' '.
|
||||
$this->l('For example the carrier can be made available for a weight range between 0 and 5kgs. Another carrier will have a range between 5 and 10kgs.').'
|
||||
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier will have a range between 5 and 10lbs.').'
|
||||
</li>
|
||||
<li>'.$this->l('When you are done, click "Save".').'</li>
|
||||
<li>'.$this->l('Click on the "Shipping" tab.').'</li>
|
||||
<li>'.$this->l('When you are done, click \\"Save.\\"').'</li>
|
||||
<li>'.$this->l('Click on the \\"Shipping\\" tab.').'</li>
|
||||
<li>'.
|
||||
$this->l('You need to choose the fees that will be applied for this carrier.').' '.
|
||||
$this->l('At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
|
||||
$this->l('You need to set the fees that will be applied for this carrier.').' '.
|
||||
$this->l('At the bottom on the page, in the \\"Fees\\" section, select the name of the carrier.').'
|
||||
</li>
|
||||
<li>'.$this->l('For each zone, enter a price. Click "Save".').'</li>
|
||||
<li>'.$this->l('You\'re set! The new carrier will be displayed to your customers.').'</li>
|
||||
<li>'.$this->l('For each zone, enter a price and click \\"Save.\\"').'</li>
|
||||
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
|
||||
</ul>'
|
||||
);
|
||||
$this->_select = 'b.*';
|
||||
@@ -202,14 +202,14 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'hint' => $this->l('Allowed characters: letters, spaces and').' ().-',
|
||||
'desc' => array(
|
||||
$this->l('Carrier name displayed during checkout'),
|
||||
$this->l('With a value of 0, the carrier name will be replaced by the shop name')
|
||||
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name')
|
||||
)
|
||||
),
|
||||
array(
|
||||
'type' => 'file',
|
||||
'label' => $this->l('Logo:'),
|
||||
'name' => 'logo',
|
||||
'desc' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
|
||||
'desc' => $this->l('Upload a logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -219,22 +219,22 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'required' => true,
|
||||
'size' => 41,
|
||||
'maxlength' => 128,
|
||||
'desc' => $this->l('Time taken for product delivery; displayed during checkout')
|
||||
'desc' => $this->l('Estimated delivery time, displayed during checkout')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Grade:'),
|
||||
'label' => $this->l('Speed Grade:'),
|
||||
'name' => 'grade',
|
||||
'required' => false,
|
||||
'size' => 1,
|
||||
'desc' => $this->l('"0" for a longest shipping delay,"9" for the shortest shipping delay.')
|
||||
'desc' => $this->l('\\"0\\" for a longest shipping delay,\\"9\\" for the shortest shipping delay.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('URL:'),
|
||||
'name' => 'url',
|
||||
'size' => 40,
|
||||
'desc' => $this->l('URL for the tracking number; type \'@\' where the tracking number will appear')
|
||||
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
|
||||
),
|
||||
array(
|
||||
'type' => 'checkbox',
|
||||
@@ -245,14 +245,14 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'id' => 'id_zone',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('The zone in which this carrier is to be used')
|
||||
'desc' => $this->l('The zones in which this carrier is to be used')
|
||||
),
|
||||
array(
|
||||
'type' => 'group',
|
||||
'label' => $this->l('Group access:'),
|
||||
'name' => 'groupBox',
|
||||
'values' => Group::getGroups(Context::getContext()->language->id),
|
||||
'desc' => $this->l('Mark all groups you want to give access to this carrier')
|
||||
'desc' => $this->l('Mark all groups for which you want to give access to this carrier')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -273,7 +273,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Include or exclude carrier from list of carriers on Front Office')
|
||||
'desc' => $this->l('Enable carrier in the Front Office')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -293,7 +293,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Apply shipping costs and additional shipping costs by products in carrier price')
|
||||
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -373,7 +373,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'id' => 'id',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
|
||||
'desc' => $this->l('Out-of-range behavior when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -381,7 +381,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'name' => 'max_height',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or nothing, to ignore this field.')
|
||||
'desc' => $this->l('Maximum height managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -389,23 +389,23 @@ class AdminCarriersControllerCore extends AdminController
|
||||
'name' => 'max_width',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or nothing, to ignore this field.')
|
||||
'desc' => $this->l('Maximum width managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Maximium package deep:'),
|
||||
'label' => $this->l('Maximium package depth:'),
|
||||
'name' => 'max_depth',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.')
|
||||
'desc' => $this->l('Maximum depth managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Maximium package weigth:'),
|
||||
'label' => $this->l('Maximium package weight:'),
|
||||
'name' => 'max_weight',
|
||||
'required' => false,
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or nothing, to ignore this field.')
|
||||
'desc' => $this->l('Maximum weight managed by this carrier. Set \\"0\\" or leave this field blank to ignore this.')
|
||||
),
|
||||
array(
|
||||
'type' => 'hidden',
|
||||
@@ -530,7 +530,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
if ($this->tabAccess['edit'] === '1')
|
||||
{
|
||||
if (Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT'))
|
||||
$this->errors[] = Tools::displayError('You can\'t disable the default carrier, please change your default carrier first.');
|
||||
$this->errors[] = Tools::displayError('You cannot disable the default carrier, please change your default carrier first.');
|
||||
else
|
||||
parent::postProcess();
|
||||
}
|
||||
@@ -541,7 +541,7 @@ class AdminCarriersControllerCore extends AdminController
|
||||
{
|
||||
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|
||||
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
|
||||
$this->errors[] = $this->l('Please set another carrier as default before deleting');
|
||||
$this->errors[] = $this->l('Please set another carrier as default before deleting this one');
|
||||
else
|
||||
{
|
||||
// if deletion : removes the carrier from the warehouse/carrier association
|
||||
|
||||
@@ -68,7 +68,7 @@ class AdminCartRulesControllerCore extends AdminController
|
||||
if ((int)Tools::getValue('minimum_amount') < 0)
|
||||
$this->errors[] = Tools::displayError('Minimum amount cannot be lower than 0');
|
||||
if ((float)Tools::getValue('reduction_percent') < 0 || (float)Tools::getValue('reduction_percent') > 100)
|
||||
$this->errors[] = Tools::displayError('Reduction percent must range from 0% to 100%');
|
||||
$this->errors[] = Tools::displayError('Reduction percent must be between 0% and 100%');
|
||||
if ((int)Tools::getValue('reduction_amount') < 0)
|
||||
$this->errors[] = Tools::displayError('Reduction amount cannot be lower than 0');
|
||||
}
|
||||
@@ -467,7 +467,7 @@ class AdminCartRulesControllerCore extends AdminController
|
||||
'show_toolbar' => true,
|
||||
'toolbar_btn' => $this->toolbar_btn,
|
||||
'toolbar_scroll' => $this->toolbar_scroll,
|
||||
'title' => $this->l('Payment : Cart Rules '),
|
||||
'title' => $this->l('Payment: Cart Rules'),
|
||||
'defaultDateFrom' => date('Y-m-d H:00:00'),
|
||||
'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')),
|
||||
'customerFilter' => $customer_filter,
|
||||
|
||||
@@ -51,7 +51,7 @@ class AdminCartsControllerCore extends AdminController
|
||||
'width' => 25
|
||||
),
|
||||
'id_order' => array(
|
||||
'title' => $this->l('ID Order'),
|
||||
'title' => $this->l('Order ID'),
|
||||
'align' => 'center', 'width' => 25
|
||||
),
|
||||
'customer' => array(
|
||||
@@ -249,7 +249,7 @@ class AdminCartsControllerCore extends AdminController
|
||||
if (!$this->context->cart->id)
|
||||
return;
|
||||
if ($this->context->cart->OrderExists())
|
||||
$errors[] = Tools::displayError('An order already placed with this cart');
|
||||
$errors[] = Tools::displayError('An order has already been placed with this cart');
|
||||
elseif (!($id_product = (int)Tools::getValue('id_product')) || !($product = new Product((int)$id_product, true, $this->context->language->id)))
|
||||
$errors[] = Tools::displayError('Invalid product');
|
||||
elseif (!($qty = Tools::getValue('qty')) || $qty == 0)
|
||||
|
||||
@@ -295,9 +295,9 @@ class AdminCategoriesControllerCore extends AdminController
|
||||
$guest = new Group(Configuration::get('PS_GUEST_GROUP'));
|
||||
$default = new Group(Configuration::get('PS_CUSTOMER_GROUP'));
|
||||
|
||||
$unidentified_group_information = sprintf($this->l('%s - All persons without a customer account or unauthenticated.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
|
||||
$unidentified_group_information = sprintf($this->l('%s - All people without a validated customer account.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
|
||||
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
|
||||
$default_group_information = sprintf($this->l('%s - All persons who created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
|
||||
$default_group_information = sprintf($this->l('%s - All people who created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
|
||||
$root_category = Category::getRootCategory();
|
||||
$root_category = array('id_category' => $root_category->id_category, 'name' => $root_category->name);
|
||||
$this->fields_form = array(
|
||||
@@ -426,15 +426,15 @@ class AdminCategoriesControllerCore extends AdminController
|
||||
'label' => $this->l('Group access:'),
|
||||
'name' => 'groupBox',
|
||||
'values' => Group::getGroups(Context::getContext()->language->id),
|
||||
'info_introduction' => $this->l('You have now three default customer groups.'),
|
||||
'info_introduction' => $this->l('You now have three default customer groups.'),
|
||||
'unidentified' => $unidentified_group_information,
|
||||
'guest' => $guest_group_information,
|
||||
'customer' => $default_group_information,
|
||||
'desc' => $this->l('Mark all groups you want to give access to this category')
|
||||
'desc' => $this->l('Mark all customer groups you want to give access to this category')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -498,7 +498,7 @@ class AdminCategoriesControllerCore extends AdminController
|
||||
$this->errors[] = Tools::displayError($this->l('Category cannot be moved here'));
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of herself.'));
|
||||
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of itself.'));
|
||||
}
|
||||
parent::processAdd($token);
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
|
||||
@@ -61,7 +61,7 @@ class AdminContactsControllerCore extends AdminController
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
'lang' => true,
|
||||
'desc' => $this->l('Contact name, e.g., Technical Support'),
|
||||
'desc' => $this->l('Contact name (e.g. Technical Support)'),
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -73,12 +73,12 @@ class AdminContactsControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Save in Customer Service?'),
|
||||
'label' => $this->l('Save messages?'),
|
||||
'name' => 'customer_service',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('The messages will be saved in the Customer Service tab'),
|
||||
'desc' => $this->l('If enabled, all messages will be saved in the \\"Customer Service\\" tab'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'customer_service_on',
|
||||
|
||||
@@ -44,7 +44,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'text' => $this->l('Delete selected'),
|
||||
'confirm' => $this->l('Delete selected items?')),
|
||||
'affectzone' => array(
|
||||
'text' => $this->l('Affect a new zone'))
|
||||
'text' => $this->l('Assign to a new zone'))
|
||||
);
|
||||
|
||||
$this->fieldImageSettings = array(
|
||||
@@ -54,10 +54,10 @@ class AdminCountriesControllerCore extends AdminController
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Countries options'),
|
||||
'title' => $this->l('Country options'),
|
||||
'fields' => array(
|
||||
'PS_RESTRICT_DELIVERED_COUNTRIES' => array(
|
||||
'title' => $this->l('Restrict countries in FO by those delivered by active carriers'),
|
||||
'title' => $this->l('Restrict country selections in Front Office to those covered by active carriers'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool',
|
||||
'default' => '0'
|
||||
@@ -166,7 +166,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'size' => 30,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('Name of country')
|
||||
'desc' => $this->l('Country name')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -176,7 +176,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'maxlength' => 3,
|
||||
'class' => 'uppercase',
|
||||
'required' => true,
|
||||
'desc' => $this->l('2- or 3-letter ISO code, e.g., FR for France').'.
|
||||
'desc' => $this->l('2- or 3-letter ISO code (e.g. US for United States)').'.
|
||||
<a href="http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm" target="_blank">'.
|
||||
$this->l('Official list here').'
|
||||
</a>.'
|
||||
@@ -189,7 +189,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'maxlength' => 3,
|
||||
'class' => 'uppercase',
|
||||
'required' => true,
|
||||
'desc' => $this->l('International call prefix, e.g., 33 for France.')
|
||||
'desc' => $this->l('International call prefix, (e.g. 1 for United States)')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -242,11 +242,11 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'name' => 'zip_code_format',
|
||||
'class' => 'uppercase',
|
||||
'required' => true,
|
||||
'desc' => $this->l('National zip code (L for a letter, N for a number and C for the Iso code), e.g., NNNNN for France. No verification if undefined')
|
||||
'desc' => $this->l('National zip code (L for a letter, N for a number and C for the Iso code), e.g. NNNNN for the United States. No verification if undefined')
|
||||
),
|
||||
array(
|
||||
'type' => 'address_layout',
|
||||
'label' => $this->l('Address layout:'),
|
||||
'label' => $this->l('Address format:'),
|
||||
'name' => 'address_layout',
|
||||
'address_layout' => $address_layout,
|
||||
'encoding_address_layout' => urlencode($address_layout),
|
||||
@@ -272,7 +272,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Display or not this country')
|
||||
'desc' => $this->l('Display this country')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -295,7 +295,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Need tax identification number?'),
|
||||
'label' => $this->l('Need Tax identification number?'),
|
||||
'name' => 'need_identification_number',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
@@ -314,7 +314,7 @@ class AdminCountriesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Display tax label:'),
|
||||
'label' => $this->l('Display tax label (e.g. \\"Tax incl.\\"):'),
|
||||
'name' => 'display_tax_label',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
@@ -356,13 +356,13 @@ class AdminCountriesControllerCore extends AdminController
|
||||
if (!Tools::getValue('id_'.$this->table))
|
||||
{
|
||||
if (Validate::isLanguageIsoCode(Tools::getValue('iso_code')) && Country::getByIso(Tools::getValue('iso_code')))
|
||||
$this->errors[] = Tools::displayError('This iso code already exist, you can\'t create two country with the same iso code');
|
||||
$this->errors[] = Tools::displayError('This ISO code already exists, you cannot create two country with the same ISO code');
|
||||
}
|
||||
else if (Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
|
||||
{
|
||||
$id_country = Country::getByIso(Tools::getValue('iso_code'));
|
||||
if (!is_null($id_country) && $id_country != Tools::getValue('id_'.$this->table))
|
||||
$this->errors[] = Tools::displayError('This iso code already exist, you can\'t create two country with the same iso code');
|
||||
$this->errors[] = Tools::displayError('This ISO code already exists, you cannot create two country with the same ISO code');
|
||||
}
|
||||
|
||||
if (!count($this->errors))
|
||||
|
||||
@@ -45,7 +45,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'id_currency' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
|
||||
'name' => array('title' => $this->l('Currency')),
|
||||
'iso_code' => array('title' => $this->l('ISO code'), 'align' => 'center', 'width' => 80),
|
||||
'iso_code_num' => array('title' => $this->l('ISO code num'), 'align' => 'center', 'width' => 120),
|
||||
'iso_code_num' => array('title' => $this->l('ISO code number'), 'align' => 'center', 'width' => 120),
|
||||
'sign' => array('title' => $this->l('Symbol'), 'width' => 20, 'align' => 'center', 'orderby' => false, 'search' => false),
|
||||
'conversion_rate' => array('title' => $this->l('Conversion rate'), 'float' => true, 'align' => 'center', 'width' => 130, 'search' => false),
|
||||
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
|
||||
@@ -57,7 +57,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'change' => array(
|
||||
'title' => $this->l('Currency rates'),
|
||||
'image' => '../img/admin/exchangesrate.gif',
|
||||
'description' => $this->l('Update your currencies exchanges rates with a real-time tool'),
|
||||
'description' => $this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is.'),
|
||||
'submit' => array(
|
||||
'title' => $this->l('Update currency rates'),
|
||||
'class' => 'button',
|
||||
@@ -65,9 +65,9 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'cron' => array(
|
||||
'title' => $this->l('Currency rates update'),
|
||||
'title' => $this->l('Automatically update currency rates'),
|
||||
'image' => '../img/admin/tab-tools.gif',
|
||||
'info' => $this->l('Place this URL in crontab or call it manually daily').':<br />
|
||||
'info' => $this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is. Place this URL in crontab or access it manually daily').':<br />
|
||||
<b>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</b></p>',
|
||||
)
|
||||
);
|
||||
@@ -99,7 +99,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'maxlength' => 32,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Only letters and the minus character are allowed'),
|
||||
'desc' => $this->l('Will appear on Front Office, e.g., euro, dollar').'...',
|
||||
'desc' => $this->l('Will appear in Front Office (e.g. $, €)').'...',
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -108,7 +108,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'size' => 30,
|
||||
'maxlength' => 32,
|
||||
'required' => true,
|
||||
'desc' => $this->l('ISO code, e.g., USD for dollar, EUR for euro').'...',
|
||||
'desc' => $this->l('ISO code (e.g. USD for Dollars, EUR for Euros)').'...',
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -117,7 +117,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'size' => 30,
|
||||
'maxlength' => 32,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Numeric ISO code, e.g., 840 for dollar, 978 for euro').'...',
|
||||
'desc' => $this->l('Numeric ISO code (e.g. 840 for Dollars, 978 for Euros)').'...',
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -126,7 +126,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'size' => 3,
|
||||
'maxlength' => 8,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Will appear on Front Office, e.g., €, $').'...',
|
||||
'desc' => $this->l('Will appear in Front Office (e.g. $, €)').'...',
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -144,11 +144,11 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'size' => 3,
|
||||
'maxlength' => 11,
|
||||
'required' => true,
|
||||
'desc' =>$this->l('Applies to all prices, e.g.,').' $1,240.15',
|
||||
'desc' =>$this->l('Applies to all prices, e.g.').' $1,240.15',
|
||||
'options' => array(
|
||||
'query' => array(
|
||||
array('key' => 1, 'name' => 'X0,000.00 ('.$this->l('as with dollars').')'),
|
||||
array('key' => 2, 'name' => '0 000,00X ('.$this->l('as with euros').')'),
|
||||
array('key' => 1, 'name' => 'X0,000.00 ('.$this->l('as with Dollars').')'),
|
||||
array('key' => 2, 'name' => '0 000,00X ('.$this->l('as with Euros').')'),
|
||||
array('key' => 3, 'name' => 'X0.000,00'),
|
||||
array('key' => 4, 'name' => '0,000.00X'),
|
||||
),
|
||||
@@ -163,7 +163,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('Display decimals on prices'),
|
||||
'desc' => $this->l('Display decimals in prices'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'decimals_on',
|
||||
@@ -179,12 +179,12 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Blank:'),
|
||||
'label' => $this->l('Spacing:'),
|
||||
'name' => 'blank',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('Include a blank between sign and price, e.g.,').'<br />$1,240.15 -> $ 1,240.15',
|
||||
'desc' => $this->l('Include a space between symbol and price, e.g.').'<br />$1,240.15 -> $ 1,240.15',
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'blank_on',
|
||||
@@ -247,7 +247,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
if (Validate::isLoadedObject($object = $this->loadObject()))
|
||||
{
|
||||
if ($object->id == Configuration::get('PS_CURRENCY_DEFAULT'))
|
||||
$this->errors[] = $this->l('You can\'t delete the default currency');
|
||||
$this->errors[] = $this->l('You cannot delete the default currency');
|
||||
else if ($object->delete())
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=1'.'&token='.$this->token);
|
||||
else
|
||||
@@ -267,7 +267,7 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
if (Validate::isLoadedObject($object = $this->loadObject()))
|
||||
{
|
||||
if ($object->active && $object->id == Configuration::get('PS_CURRENCY_DEFAULT'))
|
||||
$this->errors[] = $this->l('You can\'t disable the default currency');
|
||||
$this->errors[] = $this->l('You cannot disable the default currency');
|
||||
else if ($object->toggleStatus())
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category =
|
||||
(int)Tools::getValue('id_category')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.$this->token);
|
||||
|
||||
@@ -52,7 +52,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_REGISTRATION_PROCESS_TYPE' => array(
|
||||
'title' => $this->l('Registration process type'),
|
||||
'desc' => $this->l('The "Only account creation" step register process allows the customer to register faster, and create his address later.'),
|
||||
'desc' => $this->l('The \\"Only account creation\\" registration option allows the customer to register faster, and create his address later.'),
|
||||
'validation' => 'isInt',
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
@@ -77,13 +77,13 @@ class AdminCustomerPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_B2B_ENABLE' => array(
|
||||
'title' => $this->l('Enable B2B mode'),
|
||||
'desc' => $this->l('Activate or deactivate B2B mode. When this option is enable some features about B2B appear.'),
|
||||
'desc' => $this->l('Activate or deactivate B2B mode. When this option is enabled some B2B features are available.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button'),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -134,73 +134,73 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
'title' => $this->l('Customer service options'),
|
||||
'fields' => array(
|
||||
'PS_SAV_IMAP_URL' => array(
|
||||
'title' => $this->l('Imap url'),
|
||||
'desc' => $this->l('Url for imap server (mail.server.com)'),
|
||||
'title' => $this->l('IMAP URL'),
|
||||
'desc' => $this->l('URL for IMAP server (mail.server.com)'),
|
||||
'type' => 'text',
|
||||
'size' => 40,
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_PORT' => array(
|
||||
'title' => $this->l('Imap port'),
|
||||
'desc' => $this->l('Port to use to connect imap server'),
|
||||
'title' => $this->l('IMAP port'),
|
||||
'desc' => $this->l('Port to use to connect to IMAP server'),
|
||||
'type' => 'text',
|
||||
'defaultValue' => 143,
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_USER' => array(
|
||||
'title' => $this->l('Imap user'),
|
||||
'desc' => $this->l('User to use to connect imap server'),
|
||||
'title' => $this->l('IMAP user'),
|
||||
'desc' => $this->l('User to use to connect to IMAP server'),
|
||||
'type' => 'text',
|
||||
'size' => 40,
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_PWD' => array(
|
||||
'title' => $this->l('Imap password'),
|
||||
'desc' => $this->l('Password to use to connect imap server'),
|
||||
'title' => $this->l('IMAP password'),
|
||||
'desc' => $this->l('Password to use to connect IMAP server'),
|
||||
'type' => 'text',
|
||||
'size' => 40,
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_DELETE_MSG' => array(
|
||||
'title' => $this->l('Deletes messages'),
|
||||
'desc' => $this->l('Deletes message after sync. If you do not active this option, the sync will be longer'),
|
||||
'title' => $this->l('Delete messages'),
|
||||
'desc' => $this->l('Delete message after sync. If you do not active this option, the sync will be longer'),
|
||||
'type' => 'bool',
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_NORSH' => array(
|
||||
'title' => $this->l('Imap option').' (/norsh)',
|
||||
'title' => $this->l('IMAP options').' (/norsh)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Do not use rsh or ssh to establish a preauthenticated IMAP session'),
|
||||
'desc' => $this->l('Do not use RSH or SSH to establish a preauthenticated IMAP session'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_SSL' => array(
|
||||
'title' => $this->l('Imap option').' (/ssl)',
|
||||
'title' => $this->l('IMAP options').' (/ssl)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Use the Secure Socket Layer to encrypt the session'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_VALIDATE-CERT' => array(
|
||||
'title' => $this->l('Imap option').' (/validate-cert)',
|
||||
'title' => $this->l('IMAP options').' (/validate-cert)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Validate certificates from TLS/SSL server'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_NOVALIDATE-CERT' => array(
|
||||
'title' => $this->l('Imap option').' (/novalidate-cert)',
|
||||
'title' => $this->l('IMAP options').' (/novalidate-cert)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Do not validate certificates from TLS/SSL server, needed if server uses self-signed certificates'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_TLS' => array(
|
||||
'title' => $this->l('Imap option').' (/tls)',
|
||||
'title' => $this->l('IMAP options').' (/tls)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Force use of start-TLS to encrypt the session, and reject connection to servers that do not support it'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
'PS_SAV_IMAP_OPT_NOTLS' => array(
|
||||
'title' => $this->l('Imap option').' (/notls)',
|
||||
'title' => $this->l('IMAP options').' (/notls)',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('do not do start-TLS to encrypt the session, even with servers that support it'),
|
||||
'desc' => $this->l('do not use start-TLS to encrypt the session, even with servers that support it'),
|
||||
'visibility' => Shop::CONTEXT_ALL,
|
||||
),
|
||||
),
|
||||
@@ -249,8 +249,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
$this->l('Threads pending') => $pending = CustomerThread::getTotalCustomerThreads('status LIKE "%pending%"'),
|
||||
$this->l('Total customer messages') => CustomerMessage::getTotalCustomerMessages('id_employee = 0'),
|
||||
$this->l('Total employee messages') => CustomerMessage::getTotalCustomerMessages('id_employee != 0'),
|
||||
$this->l('Threads unread') => $unread = CustomerThread::getTotalCustomerThreads('status = "open"'),
|
||||
$this->l('Threads closed') => $all - ($unread + $pending)
|
||||
$this->l('Unread threads') => $unread = CustomerThread::getTotalCustomerThreads('status = "open"'),
|
||||
$this->l('Closed threads') => $all - ($unread + $pending)
|
||||
);
|
||||
|
||||
$this->tpl_list_vars = array(
|
||||
@@ -358,7 +358,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
}
|
||||
}
|
||||
else
|
||||
$this->errors[] = '<div class="alert error">'.Tools::displayError('Email invalid.').'</div>';
|
||||
$this->errors[] = '<div class="alert error">'.Tools::displayError('E-mail invalid.').'</div>';
|
||||
}
|
||||
if (Tools::isSubmit('submitReply'))
|
||||
{
|
||||
@@ -402,7 +402,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
);
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('An error occurred, your message was not sent. Please contact your system administrator.');
|
||||
$this->errors[] = Tools::displayError('An error occurred, your message was not sent. Please contact your system administrator.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -470,24 +470,24 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
if ($next_thread)
|
||||
$actions['next_thread'] = array(
|
||||
'href' => self::$currentIndex.'&id_customer_thread='.(int)$next_thread.'&viewcustomer_thread&token='.$this->token,
|
||||
'name' => $this->l('Answer to the next unanswered message in this category')
|
||||
'name' => $this->l('Reply to the next unanswered message in this category')
|
||||
);
|
||||
else
|
||||
$actions['next_thread'] = array(
|
||||
'href' => false,
|
||||
'name' => $this->l('The other messages in this category have been answered')
|
||||
'name' => $this->l('All other messages in this category have been answered')
|
||||
);
|
||||
|
||||
if ($thread->status != 'closed')
|
||||
$actions['closed'] = array(
|
||||
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=2&id_customer_thread='.Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
|
||||
'name' => $this->l('Set this message as handled')
|
||||
'name' => $this->l('Mark this message as handled')
|
||||
);
|
||||
|
||||
if ($thread->status != 'pending1')
|
||||
$actions['pending1'] = array(
|
||||
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=3&id_customer_thread='.Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
|
||||
'name' => $this->l('Declare this message as "pending 1" (will be answered later)')
|
||||
'name' => $this->l('Mark this message as \\"pending 1\\" (will be answered later)')
|
||||
);
|
||||
else
|
||||
$actions['pending1'] = array(
|
||||
@@ -498,7 +498,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
|
||||
if ($thread->status != 'pending2')
|
||||
$actions['pending2'] = array(
|
||||
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=4&id_customer_thread='.Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
|
||||
'name' => $this->l('Declare this message as "pending 2" (will be answered later)')
|
||||
'name' => $this->l('Mark this message as \\"pending 2\\" (will be answered later)')
|
||||
);
|
||||
else
|
||||
$actions['pending2'] = array(
|
||||
|
||||
@@ -127,7 +127,7 @@ class AdminCustomersControllerCore extends AdminController
|
||||
'align' => 'right'
|
||||
),
|
||||
'connect' => array(
|
||||
'title' => $this->l('Connection'),
|
||||
'title' => $this->l('Last visit'),
|
||||
'width' => 100,
|
||||
'type' => 'datetime',
|
||||
'search' => false,
|
||||
@@ -375,11 +375,11 @@ class AdminCustomersControllerCore extends AdminController
|
||||
'name' => 'groupBox',
|
||||
'values' => $groups,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Check all the box(es) of groups of which the customer is to be a member')
|
||||
'desc' => $this->l('Select all customer groups you would like to apply to this customer')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Default group:'),
|
||||
'label' => $this->l('Default customer group:'),
|
||||
'name' => 'id_default_group',
|
||||
'options' => array(
|
||||
'query' => $groups,
|
||||
@@ -437,7 +437,7 @@ class AdminCustomersControllerCore extends AdminController
|
||||
);
|
||||
$this->fields_form['input'][] = array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Outstanding allow:'),
|
||||
'label' => $this->l('Outstanding allowed:'),
|
||||
'name' => 'outstanding_allow_amount',
|
||||
'size' => 10,
|
||||
'hint' => $this->l('Valid characters:').' 0-9',
|
||||
@@ -782,11 +782,11 @@ class AdminCustomersControllerCore extends AdminController
|
||||
if (!Validate::isLoadedObject($customer))
|
||||
$this->errors[] = Tools::displayError('This customer does not exist.');
|
||||
if (Customer::customerExists($customer->email))
|
||||
$this->errors[] = Tools::displayError('This customer already exist as non-guest.');
|
||||
$this->errors[] = Tools::displayError('This customer already exists as a non-guest.');
|
||||
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 customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -798,10 +798,10 @@ class AdminCustomersControllerCore extends AdminController
|
||||
{
|
||||
$customer = new Customer($this->id_object);
|
||||
if (!Validate::isLoadedObject($customer))
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
|
||||
$customer->newsletter = $customer->newsletter ? 0 : 1;
|
||||
if (!$customer->update())
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
|
||||
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
|
||||
}
|
||||
|
||||
@@ -814,10 +814,10 @@ class AdminCustomersControllerCore extends AdminController
|
||||
{
|
||||
$customer = new Customer($this->id_object);
|
||||
if (!Validate::isLoadedObject($customer))
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
|
||||
$customer->optin = $customer->optin ? 0 : 1;
|
||||
if (!$customer->update())
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while updating the customer.');
|
||||
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
|
||||
}
|
||||
|
||||
@@ -853,7 +853,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 selected item?').$name,
|
||||
'action' => $this->l('Delete'),
|
||||
'id' => $id,
|
||||
));
|
||||
|
||||
@@ -35,7 +35,7 @@ class AdminDeliverySlipControllerCore extends AdminController
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Delivery slips options'),
|
||||
'title' => $this->l('Delivery slip options'),
|
||||
'fields' => array(
|
||||
'PS_DELIVERY_PREFIX' => array(
|
||||
'title' => $this->l('Delivery prefix:'),
|
||||
@@ -73,7 +73,7 @@ class AdminDeliverySlipControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2007-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
|
||||
),
|
||||
array(
|
||||
'type' => 'date',
|
||||
@@ -82,7 +82,7 @@ class AdminDeliverySlipControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2008-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
@@ -104,9 +104,9 @@ class AdminDeliverySlipControllerCore extends AdminController
|
||||
if (Tools::isSubmit('submitAdddelivery'))
|
||||
{
|
||||
if (!Validate::isDate(Tools::getValue('date_from')))
|
||||
$this->errors[] = Tools::displayError('Invalid from date');
|
||||
$this->errors[] = Tools::displayError('Invalid \'from\' date');
|
||||
if (!Validate::isDate(Tools::getValue('date_to')))
|
||||
$this->errors[] = Tools::displayError('Invalid end date');
|
||||
$this->errors[] = Tools::displayError('Invalid \'to\' date');
|
||||
if (!count($this->errors))
|
||||
{
|
||||
if (count(OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
|
||||
|
||||
@@ -44,7 +44,7 @@ class AdminEmailsControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_MAIL_EMAIL_MESSAGE' => array(
|
||||
'title' => $this->l('Send e-mail to:'),
|
||||
'desc' => $this->l('When customers send message from order page'),
|
||||
'desc' => $this->l('Where customers send messages from order page'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'type' => 'select',
|
||||
'cast' => 'intval',
|
||||
@@ -82,8 +82,8 @@ class AdminEmailsControllerCore extends AdminController
|
||||
'bottom' => '</div>',
|
||||
'fields' => array(
|
||||
'PS_MAIL_DOMAIN' => array(
|
||||
'title' => $this->l('Mail domain:'),
|
||||
'desc' => $this->l('Fully qualified domain name (keep it empty if you do not know)'),
|
||||
'title' => $this->l('Mail domain name:'),
|
||||
'desc' => $this->l('Fully qualified domain name (keep empty if you do not know)'),
|
||||
'empty' => true, 'validation' =>
|
||||
'isUrl', 'size' => 30,
|
||||
'type' => 'text',
|
||||
@@ -91,7 +91,7 @@ class AdminEmailsControllerCore extends AdminController
|
||||
),
|
||||
'PS_MAIL_SERVER' => array(
|
||||
'title' => $this->l('SMTP server:'),
|
||||
'desc' => $this->l('IP or server name (e.g., smtp.mydomain.com)'),
|
||||
'desc' => $this->l('IP address or server name (e.g. smtp.mydomain.com)'),
|
||||
'validation' => 'isGenericName',
|
||||
'size' => 30,
|
||||
'type' => 'text',
|
||||
@@ -138,7 +138,7 @@ class AdminEmailsControllerCore extends AdminController
|
||||
),
|
||||
'PS_MAIL_SMTP_PORT' => array(
|
||||
'title' => $this->l('Port:'),
|
||||
'desc' => $this->l('Number of port to use'),
|
||||
'desc' => $this->l('Port number to use'),
|
||||
'validation' => 'isInt',
|
||||
'size' => 5,
|
||||
'type' => 'text',
|
||||
@@ -194,7 +194,7 @@ class AdminEmailsControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
@@ -204,6 +204,6 @@ class AdminEmailsControllerCore extends AdminController
|
||||
$_POST['PS_SHOP_EMAIL'] = Configuration::get('PS_SHOP_EMAIL');
|
||||
|
||||
if ($_POST['PS_MAIL_METHOD'] == 2 && (empty($_POST['PS_MAIL_SERVER']) || empty($_POST['PS_MAIL_SMTP_PORT'])))
|
||||
$this->errors[] = Tools::displayError('You must define a SMTP server and a SMTP port. If you do not know, use the PHP mail() function instead.');
|
||||
$this->errors[] = Tools::displayError('You must define an SMTP server and an SMTP port. If you do not know, use the PHP mail() function instead.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,11 +82,11 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Employees options'),
|
||||
'title' => $this->l('Employee options'),
|
||||
'fields' => array(
|
||||
'PS_PASSWD_TIME_BACK' => array(
|
||||
'title' => $this->l('Password regenerate:'),
|
||||
'desc' => $this->l('Security minimum time to wait to regenerate a new password'),
|
||||
'title' => $this->l('Password regeneration:'),
|
||||
'desc' => $this->l('Security: minimum time to wait between two password changes'),
|
||||
'cast' => 'intval',
|
||||
'size' => 5,
|
||||
'type' => 'text',
|
||||
@@ -94,8 +94,8 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_BO_ALLOW_EMPLOYEE_FORM_LANG' => array(
|
||||
'title' => $this->l('Memorize form language:'),
|
||||
'desc' => $this->l('Allow employees to save their own default form language'),
|
||||
'title' => $this->l('Memorize language used in Admin panel forms:'),
|
||||
'desc' => $this->l('Allow employees to select a specific language for Admin panel forms'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'value',
|
||||
@@ -200,11 +200,11 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'color',
|
||||
'label' => $this->l('Back office color:'),
|
||||
'label' => $this->l('Admin panel color:'),
|
||||
'name' => 'bo_color',
|
||||
'class' => 'color mColorPickerInput',
|
||||
'size' => 20,
|
||||
'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
|
||||
'desc' => $this->l('Admin panel background will be displayed in this color. HTML colors only (e.g.').' "lightblue", "#CC6600")'
|
||||
),
|
||||
array(
|
||||
'type' => 'default_tab',
|
||||
@@ -215,10 +215,10 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Back office width'),
|
||||
'label' => $this->l('Back Office width'),
|
||||
'name' => 'bo_width',
|
||||
'size' => 10,
|
||||
'desc' => $this->l('Back office width, in pixels. The value "0" means that the back office width will be flexible.')
|
||||
'desc' => $this->l('Back Office width, in pixels. The value \\"0\\" means that the Back Office width will be flexible.')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -236,7 +236,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
'label' => $this->l('Theme:'),
|
||||
'name' => 'bo_theme',
|
||||
'options' => array('query' => $this->themes),
|
||||
'desc' => $this->l('Back office theme')
|
||||
'desc' => $this->l('Back Office theme')
|
||||
)
|
||||
)
|
||||
);
|
||||
@@ -245,7 +245,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
{
|
||||
$this->fields_form['input'][] = array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Show screencast:'),
|
||||
'label' => $this->l('Show screencast at log in:'),
|
||||
'name' => 'bo_show_screencast',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
@@ -262,7 +262,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Show the welcome video on the dashbord of the back office')
|
||||
'desc' => $this->l('Display the welcome video in the Admin panel dashboard at log in')
|
||||
);
|
||||
|
||||
$this->fields_form['input'][] = array(
|
||||
@@ -284,7 +284,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Allow or disallow this employee to log into this Back Office')
|
||||
'desc' => $this->l('Allow or disallow this employee to log into the Admin panel')
|
||||
);
|
||||
|
||||
// if employee is not SuperAdmin (id_profile = 1), don't make it possible to select the admin profile
|
||||
@@ -352,7 +352,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_ && $id_employee = Tools::getValue('id_employee') && (int)$id_employee == _PS_DEMO_MAIN_BO_ACCOUNT_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
@@ -374,7 +374,7 @@ class AdminEmployeesControllerCore extends AdminController
|
||||
$warehouses = Warehouse::getWarehousesByEmployee((int)Tools::getValue('id_employee'));
|
||||
if (Tools::isSubmit('deleteemployee') && count($warehouses) > 0)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('You cannot delete this account since it manages warehouses. Check your warehouses first.');
|
||||
$this->errors[] = Tools::displayError('You cannot delete this account because it manages warehouses. Check your warehouses first.');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -349,7 +349,7 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
}
|
||||
}
|
||||
else
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').'<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performances').'</a>');
|
||||
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').'<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performance').'</a>');
|
||||
|
||||
$this->context->smarty->assign(array(
|
||||
'content' => $this->content,
|
||||
@@ -410,7 +410,7 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
{
|
||||
// Update
|
||||
if (!$feature_value->update())
|
||||
$this->errors[] = Tools::displayError('An error has occured: Can\'t save the current feature value');
|
||||
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current feature value');
|
||||
else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors))
|
||||
Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'=&id_feature='.(int)Tools::getValue('id_feature').'&conf=3&update'.$this->table.'&token='.$this->token);
|
||||
else
|
||||
@@ -420,7 +420,7 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
{
|
||||
// Create
|
||||
if (!$feature_value->add())
|
||||
$this->errors[] = Tools::displayError('An error has occured: Can\'t save the current feature value');
|
||||
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current feature value');
|
||||
else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors))
|
||||
Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'=&id_feature='.(int)Tools::getValue('id_feature').'&conf=3&update'.$this->table.'&token='.$this->token);
|
||||
else
|
||||
|
||||
@@ -142,18 +142,18 @@ class AdminGendersControllerCore extends AdminController
|
||||
'label' => $this->l('Image Width:'),
|
||||
'name' => 'img_width',
|
||||
'size' => 4,
|
||||
'desc' => $this->l('Image width in pixel. "0" to use original size')
|
||||
'desc' => $this->l('Image width in pixels. Enter \\"0\\" to use original size')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Image Height:'),
|
||||
'name' => 'img_height',
|
||||
'size' => 4,
|
||||
'desc' => $this->l('Image height in pixel. "0" to use original size')
|
||||
'desc' => $this->l('Image height in pixels. Enter \\"0\\" to use original size')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -180,7 +180,7 @@ class AdminGendersControllerCore extends AdminController
|
||||
if (isset($this->fieldImageSettings['name']) && isset($this->fieldImageSettings['dir']))
|
||||
{
|
||||
if (!Validate::isInt(Tools::getValue('img_width')) || !Validate::isInt(Tools::getValue('img_height')))
|
||||
$this->errors[] = Tools::displayError('Width and height must be a numeric');
|
||||
$this->errors[] = Tools::displayError('Width and height must be numeric values');
|
||||
else
|
||||
{
|
||||
if ((int)Tools::getValue('img_width') > 0 && (int)Tools::getValue('img_height') > 0)
|
||||
|
||||
@@ -33,12 +33,12 @@ class AdminGeolocationControllerCore extends AdminController
|
||||
|
||||
$this->options = array(
|
||||
'geolocationConfiguration' => array(
|
||||
'title' => $this->l('Geolocation by IP:'),
|
||||
'title' => $this->l('Geolocation by IP address:'),
|
||||
'icon' => 'world',
|
||||
'fields' => array(
|
||||
'PS_GEOLOCATION_ENABLED' => array(
|
||||
'title' => $this->l('Geolocation by IP:'),
|
||||
'desc' => $this->l('This option allows you, among other things, to restrict access to your shop for many countries. See below.'),
|
||||
'title' => $this->l('Geolocation by IP address:'),
|
||||
'desc' => $this->l('This option allows you, among other things, to restrict access to your shop for certain countries. See below.'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -48,31 +48,31 @@ class AdminGeolocationControllerCore extends AdminController
|
||||
'geolocationCountries' => array(
|
||||
'title' => $this->l('Options'),
|
||||
'icon' => 'world',
|
||||
'description' => $this->l('The following features are only available if you enable the Geolocation by IP feature.'),
|
||||
'description' => $this->l('The following features are only available if you enable the Geolocation by IP address feature.'),
|
||||
'fields' => array(
|
||||
'PS_GEOLOCATION_BEHAVIOR' => array(
|
||||
'title' => $this->l('Geolocation behavior for restricted countries:'),
|
||||
'type' => 'select',
|
||||
'identifier' => 'key',
|
||||
'list' => array(array('key' => _PS_GEOLOCATION_NO_CATALOG_, 'name' => $this->l('Visitors can\'t see your catalog')),
|
||||
array('key' => _PS_GEOLOCATION_NO_ORDER_, 'name' => $this->l('Visitors can see your catalog but can\'t make an order'))),
|
||||
'list' => array(array('key' => _PS_GEOLOCATION_NO_CATALOG_, 'name' => $this->l('Visitors cannot see your catalog')),
|
||||
array('key' => _PS_GEOLOCATION_NO_ORDER_, 'name' => $this->l('Visitors can see your catalog but cannot place an order'))),
|
||||
),
|
||||
'PS_GEOLOCATION_NA_BEHAVIOR' => array(
|
||||
'title' => $this->l('Geolocation behavior for undefined countries:'),
|
||||
'title' => $this->l('Geolocation behavior for other countries:'),
|
||||
'type' => 'select',
|
||||
'identifier' => 'key',
|
||||
'list' => array(array('key' => '-1', 'name' => $this->l('All features are available')),
|
||||
array('key' => _PS_GEOLOCATION_NO_CATALOG_, 'name' => $this->l('Visitors can\'t see your catalog')),
|
||||
array('key' => _PS_GEOLOCATION_NO_ORDER_, 'name' => $this->l('Visitors can see your catalog but can\'t make an order')))
|
||||
array('key' => _PS_GEOLOCATION_NO_CATALOG_, 'name' => $this->l('Visitors cannot see your catalog')),
|
||||
array('key' => _PS_GEOLOCATION_NO_ORDER_, 'name' => $this->l('Visitors can see your catalog but cannot place an order')))
|
||||
),
|
||||
),
|
||||
),
|
||||
'geolocationWhitelist' => array(
|
||||
'title' => $this->l('Whitelist of IP addresses'),
|
||||
'title' => $this->l('IP address whitelist'),
|
||||
'icon' => 'world',
|
||||
'description' => $this->l('You can add many IP addresses, these addresses will always be allowed to access your shop (e.g. Google bots IP).'),
|
||||
'description' => $this->l('You can add IP addresses that will always be allowed to access your shop (e.g. Google bots\' IP).'),
|
||||
'fields' => array(
|
||||
'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Allowed IP addresses:'), 'type' => 'textarea_newlines', 'cols' => 80, 'rows' => 30),
|
||||
'PS_GEOLOCATION_WHITELIST' => array('title' => $this->l('Whitelisted IP addresses:'), 'type' => 'textarea_newlines', 'cols' => 80, 'rows' => 30),
|
||||
),
|
||||
'submit' => array(),
|
||||
),
|
||||
@@ -140,7 +140,7 @@ class AdminGeolocationControllerCore extends AdminController
|
||||
if (!$this->isGeoLiteCityAvailable())
|
||||
$this->displayWarning($this->l('In order to use Geolocation, please download').'
|
||||
<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">'.$this->l('this file').'</a> '.
|
||||
$this->l('and decompress it into tools/geoip/ directory'));
|
||||
$this->l('and extract it (using Winrar or Gzip) into the /tools/geoip/ directory'));
|
||||
|
||||
parent::initContent();
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ class AdminGroupShopControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Share available quantities to sale:'),
|
||||
'label' => $this->l('Share available quantities to sell:'),
|
||||
'name' => 'share_stock',
|
||||
'required' => true,
|
||||
'class' => 't',
|
||||
@@ -145,7 +145,7 @@ class AdminGroupShopControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Share available quantities to sale between shops of this group. When changing this option, all product available quantities for this group will be reset to 0.'),
|
||||
'desc' => $this->l('Share available quantities to sell between shops of this group. When changing this option, all product available quantities for this group will be reset to 0.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -170,7 +170,7 @@ class AdminGroupShopControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -196,7 +196,7 @@ class AdminGroupShopControllerCore extends AdminController
|
||||
'group' => $this->l('Groups'),
|
||||
'manufacturer' => $this->l('Manufacturers'),
|
||||
'supplier' => $this->l('Suppliers'),
|
||||
'tax_rules_group' => $this->l('Tax rules groups'),
|
||||
'tax_rules_group' => $this->l('Tax rule groups'),
|
||||
'zone' => $this->l('Zones'),
|
||||
);
|
||||
|
||||
@@ -264,7 +264,7 @@ class AdminGroupShopControllerCore extends AdminController
|
||||
if (GroupShop::getTotalGroupShops() == 1)
|
||||
$this->errors[] = Tools::displayError('You cannot delete or disable the last groupshop.');
|
||||
else if ($object->haveShops())
|
||||
$this->errors[] = Tools::displayError('You cannot delete or disable a groupshop which have this shops using it.');
|
||||
$this->errors[] = Tools::displayError('You cannot delete or disable a groupshop which has shops using it.');
|
||||
|
||||
if (count($this->errors))
|
||||
return false;
|
||||
|
||||
@@ -190,13 +190,13 @@ class AdminGroupsControllerCore extends AdminController
|
||||
'label' => $this->l('Discount (%):'),
|
||||
'name' => 'reduction',
|
||||
'size' => 33,
|
||||
'desc' => $this->l('Will automatically apply this value as a discount on ALL shop\'s products for this group\'s members.')
|
||||
'desc' => $this->l('Will automatically apply this value as a discount on all products for members of this customer group.')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Price display method:'),
|
||||
'name' => 'price_display_method',
|
||||
'desc' => $this->l('How the prices are displayed on order summary for this customer group (tax included or excluded).'),
|
||||
'desc' => $this->l('How prices are displayed in the order summary for this customer group.'),
|
||||
'options' => array(
|
||||
'query' => array(
|
||||
array(
|
||||
@@ -242,7 +242,7 @@ class AdminGroupsControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'modules',
|
||||
'label' => array('auth_modules' => $this->l('Authorized modules :'), 'unauth_modules' => $this->l('Unauthorized modules :')),
|
||||
'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')),
|
||||
'name' => 'auth_modules',
|
||||
'values' => $this->formatModuleListAuth($group->id)
|
||||
)
|
||||
|
||||
@@ -138,14 +138,14 @@ class AdminHomeControllerCore extends AdminController
|
||||
);
|
||||
|
||||
$opti_list[] = array(
|
||||
'title' => $this->l('index rebuilt after update'),
|
||||
'title' => $this->l('Index rebuilt after update'),
|
||||
'href' => $link->getAdminLink('AdminSearchConf'),
|
||||
'color' => $lights[$indexRebuiltAfterUpdate]['color'],
|
||||
'image' => $lights[$indexRebuiltAfterUpdate]['image'],
|
||||
);
|
||||
|
||||
$opti_list[] = array(
|
||||
'title' => $this->l('.htaccess up-to-date'),
|
||||
'title' => $this->l('.htaccess file up-to-date'),
|
||||
'href' => $link->getAdminLink('AdminMeta'),
|
||||
'color' => $lights[$htaccessAfterUpdate]['color'],
|
||||
'image' => $lights[$htaccessAfterUpdate]['image'],
|
||||
@@ -174,7 +174,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
$shop = Context::getContext()->shop;
|
||||
if ($_SERVER['HTTP_HOST'] != $shop->domain && $_SERVER['HTTP_HOST'] != $shop->domain_ssl)
|
||||
$this->displayWarning($this->l('You are currently connected with the following domain name:').' <span style="color: #CC0000;">'.$_SERVER['HTTP_HOST'].'</span><br />'.
|
||||
$this->l('This one is different from the main shop domain name set in shop tab:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
|
||||
$this->l('This is different from the main shop domain name set in shop tab:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
|
||||
<a href="index.php?controller=AdminShopUrl&token='.Tools::getAdminTokenLite('AdminShopUrl').'">'.
|
||||
$this->l('Click here if you want to modify the main shop domain name').'</a>');
|
||||
}
|
||||
@@ -183,50 +183,50 @@ class AdminHomeControllerCore extends AdminController
|
||||
{
|
||||
$quick_links['first'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminStats').'&module=statsbestproducts',
|
||||
'title' => $this->l('Product sold recently'),
|
||||
'description' => $this->l('Create a new category and organize your products.'),
|
||||
'title' => $this->l('Products sold recently'),
|
||||
'description' => $this->l('Create a new category and organize your catalog.'),
|
||||
);
|
||||
|
||||
$quick_links['second'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminOrders').'&addorder',
|
||||
'title' => $this->l('New order'),
|
||||
'description' => $this->l('Fill up your catalog with new articles and attributes.'),
|
||||
'description' => $this->l('Fill your catalog with new products.'),
|
||||
);
|
||||
|
||||
$quick_links['third'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminSpecificPriceRule').'&addspecific_price_rule',
|
||||
'title' => $this->l('New Price Rule for catalog'),
|
||||
'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'),
|
||||
'description' => $this->l('Monitor your activity with a thorough analysis of your shop.'),
|
||||
);
|
||||
|
||||
$quick_links['fourth'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct',
|
||||
'title' => $this->l('New Product'),
|
||||
'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'),
|
||||
'description' => $this->l('Add a new employee account and discharge a part of your duties as shop owner.'),
|
||||
);
|
||||
|
||||
$quick_links['fifth'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminModules').'&addcategory',
|
||||
'title' => $this->l('New module'),
|
||||
'description' => $this->l('Create a new category and organize your products.'),
|
||||
'description' => $this->l('Create a new category and organize your catalog.'),
|
||||
);
|
||||
|
||||
$quick_links['sixth'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminCartRules').'&addcart_rule',
|
||||
'title' => $this->l('New Price Rule for cart'),
|
||||
'description' => $this->l('Fill up your catalog with new articles and attributes.'),
|
||||
'description' => $this->l('Fill your catalog with new products.'),
|
||||
);
|
||||
|
||||
$quick_links['seventh'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminCmsContent').'&addcms',
|
||||
'title' => $this->l('New Page CMS'),
|
||||
'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'),
|
||||
'description' => $this->l('Monitor your activity with a thorough analysis of your shop.'),
|
||||
);
|
||||
|
||||
$quick_links['eighth'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminCarts').'&id_cart',
|
||||
'title' => $this->l('Abandoned Carts'),
|
||||
'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'),
|
||||
'description' => $this->l('Add a new employee account and discharge a part of your duties as shop owner.'),
|
||||
);
|
||||
return $quick_links;
|
||||
}
|
||||
@@ -239,7 +239,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
$close = $all - ($unread + $pending);
|
||||
$content = '
|
||||
<div class="table_info" id="table_info_last">
|
||||
<h5><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.$this->l('View more').'</a> '.$this->l('Customers service').'</h5>
|
||||
<h5><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.$this->l('View more').'</a> '.$this->l('Customer service').'</h5>
|
||||
<table class="table_info_details" style="width:100%;">
|
||||
<colgroup>
|
||||
<col width=""></col>
|
||||
@@ -247,7 +247,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
</colgroup>
|
||||
<tr class="tr_odd">
|
||||
<td class="td_align_left">
|
||||
'.$this->l('Thread unread').'
|
||||
'.$this->l('Unread threads').'
|
||||
</td>
|
||||
<td>
|
||||
'.$unread.'
|
||||
@@ -255,7 +255,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="td_align_left">
|
||||
'.$this->l('Thread pending').'
|
||||
'.$this->l('Pending threads').'
|
||||
</td>
|
||||
<td>
|
||||
'.$pending.'
|
||||
@@ -263,7 +263,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
</tr>
|
||||
<tr class="tr_odd">
|
||||
<td class="td_align_left">
|
||||
'.$this->l('Thread closed').'
|
||||
'.$this->l('Closed threads').'
|
||||
</td>
|
||||
<td>
|
||||
'.$close.'
|
||||
@@ -271,7 +271,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="td_align_left">
|
||||
'.$this->l('Total thread').'
|
||||
'.$this->l('Total threads').'
|
||||
</td>
|
||||
<td>
|
||||
'.$all.'
|
||||
@@ -315,7 +315,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
$results = array_merge($result, array_merge($result2, $result3));
|
||||
|
||||
$content = '<div class="table_info">
|
||||
<h5><a href="index.php?tab=AdminStats&token='.Tools::getAdminTokenLite('AdminStats').'">'.$this->l('View more').'</a> '.$this->l('Monthly Statistics').' </h5>
|
||||
<h5><a href="index.php?tab=AdminStats&token='.Tools::getAdminTokenLite('AdminStats').'">'.$this->l('View more').'</a> '.$this->l('This month\'s activity').' </h5>
|
||||
<table class="table_info_details" style="width:100%;">
|
||||
<colgroup>
|
||||
<col width=""></col>
|
||||
@@ -363,7 +363,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
public function getStatsSales()
|
||||
{
|
||||
$content = '<div id="table_info_large">
|
||||
<h5><a href="index.php?tab=AdminStats&token='.Tools::getAdminTokenLite('AdminStats').'">'.$this->l('View more').'</a> <strong>'.$this->l('Statistics').'</strong> / '.$this->l('Sales of the week').'</h5>
|
||||
<h5><a href="index.php?tab=AdminStats&token='.Tools::getAdminTokenLite('AdminStats').'">'.$this->l('View more').'</a> <strong>'.$this->l('Statistics').'</strong> / '.$this->l('This week\'s sales').'</h5>
|
||||
<div id="stat_google">';
|
||||
|
||||
$chart = new Chart();
|
||||
@@ -379,7 +379,7 @@ class AdminHomeControllerCore extends AdminController
|
||||
$chart->setSize(580, 170);
|
||||
$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
|
||||
$currency = Tools::setCurrency($this->context->cookie);
|
||||
$chart->getCurve(1)->setLabel($this->l('Sales +Tx').' ('.strtoupper($currency->iso_code).')');
|
||||
$chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')');
|
||||
|
||||
$content .= $chart->fetch();
|
||||
$content .= ' </div>
|
||||
@@ -447,12 +447,12 @@ class AdminHomeControllerCore extends AdminController
|
||||
if (Configuration::updateValue('PS_HIDE_OPTIMIZATION_TIPS', 1))
|
||||
{
|
||||
$result['result'] = 'ok';
|
||||
$result['msg'] = $this->l('Optimization Tips will be folded by default');
|
||||
$result['msg'] = $this->l('Optimization Tips will be hidden by default');
|
||||
}
|
||||
else
|
||||
{
|
||||
$result['result'] = 'error';
|
||||
$result['msg'] = $this->l('an error occured a');
|
||||
$result['msg'] = $this->l('an error occured');
|
||||
}
|
||||
$this->content = Tools::jsonEncode($result);
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'top' => '',
|
||||
'bottom' => '',
|
||||
'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a bigger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').'
|
||||
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issue, turn it off by selecting "Use JPEG".'),
|
||||
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting \\"Use JPEG\\".'),
|
||||
'fields' => array(
|
||||
'PS_IMAGE_QUALITY' => array(
|
||||
'title' => $this->l('Image quality'),
|
||||
@@ -82,7 +82,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'submit' => array('name' => 'submitImagePreferences'),
|
||||
),
|
||||
'product_images' => array(
|
||||
'title' => $this->l('Products images'),
|
||||
'title' => $this->l('Product images'),
|
||||
'fields' => array(
|
||||
'PS_IMAGE_GENERATION_METHOD' => array(
|
||||
'title' => $this->l('Image generated by:'),
|
||||
@@ -118,7 +118,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_PRODUCT_PICTURE_WIDTH' => array(
|
||||
'title' => $this->l('Product pictures width:'),
|
||||
'title' => $this->l('Product picture width:'),
|
||||
'desc' => $this->l('The maximum width of pictures uploadable by customers'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'required' => true,
|
||||
@@ -128,7 +128,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_PRODUCT_PICTURE_HEIGHT' => array(
|
||||
'title' => $this->l('Product pictures height:'),
|
||||
'title' => $this->l('Product picture height:'),
|
||||
'desc' => $this->l('The maximum height of pictures uploadable by customers'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'required' => true,
|
||||
@@ -162,7 +162,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'label' => $this->l('Type name:'),
|
||||
'name' => 'name',
|
||||
'required' => true,
|
||||
'desc' => $this->l('Letters only (e.g., small, medium, large, extra-large)')
|
||||
'desc' => $this->l('Letters and minus sign (-) only (e.g. small, medium, large, extra-large)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -189,7 +189,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to product images'),
|
||||
'desc' => $this->l('This type will be used for product images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'products_on',
|
||||
@@ -210,7 +210,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to categories images'),
|
||||
'desc' => $this->l('This type will be applied to Category images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'categories_on',
|
||||
@@ -231,7 +231,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to manufacturers images'),
|
||||
'desc' => $this->l('This type will be applied to Manufacturer images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'manufacturers_on',
|
||||
@@ -252,7 +252,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to suppliers images'),
|
||||
'desc' => $this->l('This type will be used for Supplier images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'suppliers_on',
|
||||
@@ -273,7 +273,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to scenes images'),
|
||||
'desc' => $this->l('This type will be used for scene images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'scenes_on',
|
||||
@@ -289,12 +289,12 @@ class AdminImagesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('stores:'),
|
||||
'label' => $this->l('Stores:'),
|
||||
'name' => 'stores',
|
||||
'required' => false,
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
'desc' => $this->l('This type will be applied to stores images'),
|
||||
'desc' => $this->l('This type will be used for Store images'),
|
||||
'values' => array(
|
||||
array(
|
||||
'id' => 'stores_on',
|
||||
@@ -324,9 +324,9 @@ class AdminImagesControllerCore extends AdminController
|
||||
// When moving images, if duplicate images were found they are moved to a folder named duplicates/
|
||||
if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
|
||||
{
|
||||
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ').
|
||||
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. It is likely caused by unused demonstration images. Please make sure that the folder ').
|
||||
_PS_PROD_IMG_DIR_.'duplicates/'.
|
||||
$this->l(' only contains demonstration images then delete this folder.');
|
||||
$this->l('only contains demonstration images, and then delete this folder.');
|
||||
}
|
||||
|
||||
if (Tools::getValue('submitRegenerate'.$this->table))
|
||||
@@ -581,17 +581,17 @@ class AdminImagesControllerCore extends AdminController
|
||||
if ($deleteOldImages)
|
||||
$this->_deleteOldImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false));
|
||||
if (($return = $this->_regenerateNewImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false))) === true)
|
||||
$this->errors[] = Tools::displayError('Cannot write ').$proc['type'].Tools::displayError(' images. Please check the folder\'s writing permissions.');
|
||||
$this->errors[] = Tools::displayError('Cannot write').$proc['type'].Tools::displayError('images. Please check the folder\'s writing permissions.');
|
||||
elseif ($return == 'timeout')
|
||||
$this->errors[] = Tools::displayError('Only part of the images have been regenerated, server timed out before finishing.');
|
||||
else
|
||||
{
|
||||
if ($proc['type'] == 'products')
|
||||
if ($this->_regenerateWatermark($proc['dir']) == 'timeout')
|
||||
$this->errors[] = Tools::displayError('Server timed out, the watermark may not have been applied on all your images.');
|
||||
$this->errors[] = Tools::displayError('Server timed out, the watermark may not have been applied to all images.');
|
||||
if (!count($this->errors))
|
||||
if ($this->_regenerateNoPictureImages($proc['dir'], $formats, $languages))
|
||||
$this->errors[] = Tools::displayError('Cannot write no-picture image to').' ('.$proc['type'].') '.Tools::displayError('images folder. Please check the folder\'s writing permissions.');
|
||||
$this->errors[] = Tools::displayError('Cannot write \\"No picture\\" image to').' ('.$proc['type'].') '.Tools::displayError('images folder. Please check the folder\'s writing permissions.');
|
||||
}
|
||||
}
|
||||
return (count($this->errors) > 0 ? false : true);
|
||||
@@ -621,7 +621,7 @@ class AdminImagesControllerCore extends AdminController
|
||||
$this->max_execution_time = (int)ini_get('max_execution_time');
|
||||
$result = Image::moveToNewFileSystem($this->max_execution_time);
|
||||
if ($result === 'timeout')
|
||||
$this->errors[] = Tools::displayError('Not all images have been moved, server timed out before finishing. Click on \"Move images\" again to resume moving images');
|
||||
$this->errors[] = Tools::displayError('Not all images have been moved, server timed out before finishing. Click on \\"Move images\\" again to resume moving images');
|
||||
else if ($result === false)
|
||||
$this->errors[] = Tools::displayError('Error: some or all images could not be moved.');
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ class AdminImportControllerCore extends AdminController
|
||||
),
|
||||
'image_url' => array('label' => $this->l('Image URL')),
|
||||
'delete_existing_images' => array(
|
||||
'label' => $this->l('Delete existing images (0 = no, 1 = yes)')
|
||||
'label' => $this->l('Delete existing images (0 = No, 1 = Yes)')
|
||||
),
|
||||
);
|
||||
|
||||
@@ -186,7 +186,7 @@ class AdminImportControllerCore extends AdminController
|
||||
'category' => array('label' => $this->l('Categories (x,y,z...)')),
|
||||
'price_tex' => array('label' => $this->l('Price tax excl.')),
|
||||
'price_tin' => array('label' => $this->l('Price tax incl.')),
|
||||
'id_tax_rules_group' => array('label' => $this->l('Tax rules id')),
|
||||
'id_tax_rules_group' => array('label' => $this->l('Tax rules ID')),
|
||||
'wholesale_price' => array('label' => $this->l('Wholesale price')),
|
||||
'on_sale' => array('label' => $this->l('On sale (0/1)')),
|
||||
'reduction_price' => array('label' => $this->l('Discount amount')),
|
||||
@@ -209,17 +209,17 @@ class AdminImportControllerCore extends AdminController
|
||||
'meta_keywords' => array('label' => $this->l('Meta-keywords')),
|
||||
'meta_description' => array('label' => $this->l('Meta-description')),
|
||||
'link_rewrite' => array('label' => $this->l('URL rewritten')),
|
||||
'available_now' => array('label' => $this->l('Text when in-stock')),
|
||||
'available_later' => array('label' => $this->l('Text if back-order allowed')),
|
||||
'available_now' => array('label' => $this->l('Text when in stock')),
|
||||
'available_later' => array('label' => $this->l('Text when backorder allowed')),
|
||||
'available_for_order' => array('label' => $this->l('Available for order')),
|
||||
'date_add' => array('label' => $this->l('Date add product')),
|
||||
'date_add' => array('label' => $this->l('Product creation date')),
|
||||
'show_price' => array('label' => $this->l('Show price')),
|
||||
'image' => array('label' => $this->l('Image URLs (x,y,z...)')),
|
||||
'delete_existing_images' => array(
|
||||
'label' => $this->l('Delete existing images (0 = no, 1 = yes)')
|
||||
'label' => $this->l('Delete existing images (0 = No, 1 = Yes)')
|
||||
),
|
||||
'features' => array('label' => $this->l('Feature(Name:Value:Position)')),
|
||||
'online_only' => array('label' => $this->l('Only available online')),
|
||||
'online_only' => array('label' => $this->l('Available online only')),
|
||||
'condition' => array('label' => $this->l('Condition')),
|
||||
'shop' => array(
|
||||
'label' => $this->l('ID / Name of shop')
|
||||
@@ -258,10 +258,10 @@ class AdminImportControllerCore extends AdminController
|
||||
'lastname' => array('label' => $this->l('Lastname *')),
|
||||
'firstname' => array('label' => $this->l('Firstname *')),
|
||||
'newsletter' => array('label' => $this->l('Newsletter (0/1)')),
|
||||
'optin' => array('label' => $this->l('Opt in (0/1)')),
|
||||
'optin' => array('label' => $this->l('Opt-in (0/1)')),
|
||||
'id_shop' => array(
|
||||
'label' => $this->l('ID / Name of shop'),
|
||||
'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
|
||||
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -334,7 +334,7 @@ class AdminImportControllerCore extends AdminController
|
||||
'meta_description' => array('label' => $this->l('Meta-description')),
|
||||
'shop' => array(
|
||||
'label' => $this->l('ID / Name of group shop'),
|
||||
'help' => $this->l('Ignore this field if you don\'t use multishop tool. If you leave this field empty, default shop will be used'),
|
||||
'help' => $this->l('Ignore this field if you don\'t use the multishop tool. If you leave this field empty, default shop will be used'),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -392,7 +392,7 @@ class AdminImportControllerCore extends AdminController
|
||||
'supply_order_reference' => array('label' => $this->l('Supply Order Reference *')),
|
||||
'id_product' => array('label' => $this->l('Product ID *')),
|
||||
'id_product_attribute' => array('label' => $this->l('Product Attribute ID')),
|
||||
'unit_price_te' => array('label' => $this->l('Unit Price (te) *')),
|
||||
'unit_price_te' => array('label' => $this->l('Unit Price (tax excl.) *')),
|
||||
'quantity_expected' => array('label' => $this->l('Quantity Expected *')),
|
||||
'discount_rate' => array('label' => $this->l('Discount Rate')),
|
||||
'tax_rate' => array('label' => $this->l('Tax Rate')),
|
||||
@@ -511,7 +511,7 @@ class AdminImportControllerCore extends AdminController
|
||||
// Default save button - action dynamically handled in javascript
|
||||
$this->toolbar_btn['save-import'] = array(
|
||||
'href' => '#',
|
||||
'desc' => $this->l('Import CSV data')
|
||||
'desc' => $this->l('Import .CSV data')
|
||||
);
|
||||
break;
|
||||
}
|
||||
@@ -883,7 +883,7 @@ class AdminImportControllerCore extends AdminController
|
||||
if ($category->id && $category->categoryExists($category->id) && $category->id != 1)
|
||||
$res = $category->update();
|
||||
if ($category->id == Configuration::get('PS_ROOT_CATEGORY'))
|
||||
$this->errors[] = Tools::displayError('Root category cannot be modify');
|
||||
$this->errors[] = Tools::displayError('Root category cannot be modified');
|
||||
// If no id_category or update failed
|
||||
if (!$res)
|
||||
$res = $category->add();
|
||||
@@ -1224,7 +1224,7 @@ class AdminImportControllerCore extends AdminController
|
||||
($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
|
||||
{
|
||||
if (!AdminImportController::copyImg($product->id, $image->id, $url))
|
||||
$this->warnings[] = Tools::displayError('Error copying image: ').$url;
|
||||
$this->warnings[] = Tools::displayError('Error copying image:').$url;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1306,7 +1306,7 @@ class AdminImportControllerCore extends AdminController
|
||||
($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
|
||||
{
|
||||
if (!AdminImportController::copyImg($product->id, $image->id, $url))
|
||||
$this->warnings[] = Tools::displayError('Error copying image: ').$url;
|
||||
$this->warnings[] = Tools::displayError('Error copying image:').$url;
|
||||
else
|
||||
$id_image = array($image->id);
|
||||
}
|
||||
@@ -1641,7 +1641,7 @@ class AdminImportControllerCore extends AdminController
|
||||
(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
|
||||
}
|
||||
else
|
||||
$this->errors[] = '"'.$address->customer_email.'" :'.Tools::displayError('Is not a valid Email');
|
||||
$this->errors[] = '"'.$address->customer_email.'" :'.Tools::displayError('Is not a valid e-mail address');
|
||||
}
|
||||
|
||||
if (isset($address->manufacturer) && is_numeric($address->manufacturer) && Manufacturer::manufacturerExists((int)$address->manufacturer))
|
||||
@@ -1808,7 +1808,7 @@ class AdminImportControllerCore extends AdminController
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errors[] = $this->l('Supplier not valid').' ('.$supplier->name.')';
|
||||
$this->errors[] = $this->l('Supplier is invalid').' ('.$supplier->name.')';
|
||||
$this->errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '');
|
||||
}
|
||||
}
|
||||
@@ -1969,14 +1969,14 @@ class AdminImportControllerCore extends AdminController
|
||||
$this->errors[] = sprintf($this->l('Product (%d/%d) is not available for this order (at line %d).'), $id_product,
|
||||
$id_product_attribute, $current_line + 1);
|
||||
if ($unit_price_te < 0)
|
||||
$this->errors[] = sprintf($this->l('Unit Price (te) (%d) is not valid (at line %d).'), $unit_price_te, $current_line + 1);
|
||||
$this->errors[] = sprintf($this->l('Unit Price (tax excl.) (%d) is not valid (at line %d).'), $unit_price_te, $current_line + 1);
|
||||
if ($quantity_expected < 0)
|
||||
$this->errors[] = sprintf($this->l('Quantity Expected (%d) is not valid (at line %d).'), $quantity_expected, $current_line + 1);
|
||||
if ($discount_rate < 0 || $discount_rate > 100)
|
||||
$this->errors[] = sprintf($this->l('Discount rate (%d) is not valid (at line %d). %s.'), $discount_rate,
|
||||
$current_line + 1, $this->l('Format: between 0 and 100'));
|
||||
if ($tax_rate < 0 || $tax_rate > 100)
|
||||
$this->errors[] = sprintf($this->l('Tax rate (%d) is not valid (at line %d). %s.'), $tax_rate,
|
||||
$this->errors[] = sprintf($this->l('Quantity Expected (%d) is not valid (at line %d).'), $tax_rate,
|
||||
$current_line + 1, $this->l('Format: between 0 and 100'));
|
||||
|
||||
// if no errors, sets supply order details
|
||||
@@ -2065,7 +2065,7 @@ class AdminImportControllerCore extends AdminController
|
||||
$handle = fopen(_PS_ADMIN_DIR_.'/import/'.strval(preg_replace('/\.{2,}/', '.', Tools::getValue('csv'))), 'r');
|
||||
|
||||
if (!$handle)
|
||||
$this->errors[] = Tools::displayError('Cannot read the CSV file');
|
||||
$this->errors[] = Tools::displayError('Cannot read the .CSV file');
|
||||
|
||||
AdminImportController::rewindBomAware($handle);
|
||||
|
||||
@@ -2145,7 +2145,7 @@ class AdminImportControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
@@ -2161,14 +2161,14 @@ class AdminImportControllerCore extends AdminController
|
||||
If your server configuration allows it, you may add a directive in your .htaccess, for example:')
|
||||
.'<br/><a href="'.$this->context->link->getAdminLink('AdminMeta').'" >
|
||||
<code>php_value upload_max_filesize 20M</code> '.
|
||||
Tools::displayError('(clic to open Generator tab)').'</a>';
|
||||
Tools::displayError('(click to open \\"Generators\\" tab)').'</a>';
|
||||
break;
|
||||
case UPLOAD_ERR_FORM_SIZE:
|
||||
$this->errors[] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini.
|
||||
If your server configuration allows it, you may add a directive in your .htaccess, for example:')
|
||||
.'<br/><a href="'.$this->context->link->getAdminLink('AdminMeta').'" >
|
||||
<code>php_value post_max_size 20M</code> '.
|
||||
Tools::displayError('(clic to open Generator tab)').'</a>';
|
||||
Tools::displayError('(click to open \\"Generators\\" tab)').'</a>';
|
||||
break;
|
||||
break;
|
||||
case UPLOAD_ERR_PARTIAL:
|
||||
@@ -2226,7 +2226,7 @@ class AdminImportControllerCore extends AdminController
|
||||
$this->supplyOrdersDetailsImport();
|
||||
break;
|
||||
default:
|
||||
$this->errors[] = $this->l('no entity selected');
|
||||
$this->errors[] = $this->l('Please select what you would like to import');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -87,22 +87,22 @@ class AdminInformationControllerCore extends AdminController
|
||||
|
||||
$tests_errors = array(
|
||||
'phpversion' => $this->l('Update your PHP version'),
|
||||
'upload' => $this->l('Configure your server to allow the upload file'),
|
||||
'system' => $this->l('Configure your server to allow the creation of directories and write to files'),
|
||||
'upload' => $this->l('Configure your server to allow file uploads'),
|
||||
'system' => $this->l('Configure your server to allow the creation of directories and files with write permissions'),
|
||||
'gd' => $this->l('Enable the GD library on your server'),
|
||||
'mysql_support' => $this->l('Enable the MySQL support on your server'),
|
||||
'config_dir' => $this->l('Set write permissions for config folder'),
|
||||
'cache_dir' => $this->l('Set write permissions for cache folder'),
|
||||
'sitemap' => $this->l('Set write permissions for sitemap.xml file'),
|
||||
'img_dir' => $this->l('Set write permissions for img folder and subfolders/recursively'),
|
||||
'mails_dir' => $this->l('Set write permissions for mails folder and subfolders/recursively'),
|
||||
'module_dir' => $this->l('Set write permissions for modules folder and subfolders/recursively'),
|
||||
'theme_lang_dir' => $this->l('Set write permissions for themes/')._THEME_NAME_.$this->l('/lang/ folder and subfolders/recursively'),
|
||||
'translations_dir' => $this->l('Set write permissions for translations folder and subfolders/recursively'),
|
||||
'customizable_products_dir' => $this->l('Set write permissions for upload folder and subfolders/recursively'),
|
||||
'virtual_products_dir' => $this->l('Set write permissions for download folder and subfolders/recursively'),
|
||||
'fopen' => $this->l('Enable fopen on your server'),
|
||||
'register_globals' => $this->l('Set PHP register global option to off'),
|
||||
'config_dir' => $this->l('Set write permissions for \\"config\\" folder'),
|
||||
'cache_dir' => $this->l('Set write permissions for \\"cache\\" folder'),
|
||||
'sitemap' => $this->l('Set write permissions for \\"sitemap.xml\\" file'),
|
||||
'img_dir' => $this->l('Set write permissions for \\"img\\" folder and subfolders, recursively'),
|
||||
'mails_dir' => $this->l('Set write permissions for \\"mails\\" folder and subfolders, recursively'),
|
||||
'module_dir' => $this->l('Set write permissions for \\"modules\\" folder and subfolders, recursively'),
|
||||
'theme_lang_dir' => $this->l('Set write permissions for \\"themes/')._THEME_NAME_.$this->l('/lang/\\" folder and subfolders, recursively'),
|
||||
'translations_dir' => $this->l('Set write permissions for \\"translations\\" folder and subfolders, recursively'),
|
||||
'customizable_products_dir' => $this->l('Set write permissions for \\"upload\\" folder and subfolders, recursively'),
|
||||
'virtual_products_dir' => $this->l('Set write permissions for \\"download\\" folder and subfolders, recursively'),
|
||||
'fopen' => $this->l('Allow the PHP fopen() function on your server'),
|
||||
'register_globals' => $this->l('Set PHP \\"register_global\\" option to \\"Off\\"'),
|
||||
'gz' => $this->l('Enable GZIP compression on your server')
|
||||
);
|
||||
|
||||
|
||||
@@ -39,13 +39,13 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_INVOICE' => array(
|
||||
'title' => $this->l('Enable invoices:'),
|
||||
'desc' => $this->l('Select whether or not to activate invoices for your shop'),
|
||||
'desc' => $this->l('If enabled, your customers will be able to receive an invoice for their purchases'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_INVOICE_PREFIX' => array(
|
||||
'title' => $this->l('Invoice prefix:'),
|
||||
'desc' => $this->l('Prefix used for invoices'),
|
||||
'desc' => $this->l('Prefix used for invoice name (e.g. IN00001)'),
|
||||
'size' => 6,
|
||||
'type' => 'textLang'
|
||||
),
|
||||
@@ -57,7 +57,7 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
'cast' => 'intval'
|
||||
),
|
||||
'PS_INVOICE_FREE_TEXT' => array(
|
||||
'title' => $this->l('Free Text:'),
|
||||
'title' => $this->l('Footer Text:'),
|
||||
'desc' => $this->l('This text will appear at the bottom of the invoice'),
|
||||
'size' => 6,
|
||||
'type' => 'textareaLang',
|
||||
@@ -73,7 +73,7 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
),
|
||||
'PS_PDF_USE_CACHE' => array(
|
||||
'title' => $this->l('Use disk as cache for PDF invoices'),
|
||||
'desc' => $this->l('Save memory but slow down the rendering process.'),
|
||||
'desc' => $this->l('Saves memory but slows down the rendering process.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -99,7 +99,7 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2007-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
|
||||
),
|
||||
array(
|
||||
'type' => 'date',
|
||||
@@ -108,7 +108,7 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2008-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
@@ -132,7 +132,7 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
{
|
||||
$this->fields_form = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('By statuses'),
|
||||
'title' => $this->l('By order status'),
|
||||
'image' => '../img/admin/pdf.gif'
|
||||
),
|
||||
'input' => array(
|
||||
@@ -216,10 +216,10 @@ class AdminInvoicesControllerCore extends AdminController
|
||||
if (Tools::getValue('submitAddinvoice_date'))
|
||||
{
|
||||
if (!Validate::isDate(Tools::getValue('date_from')))
|
||||
$this->errors[] = $this->l('Invalid from date');
|
||||
$this->errors[] = $this->l('Invalid \\"From:\\" date');
|
||||
|
||||
if (!Validate::isDate(Tools::getValue('date_to')))
|
||||
$this->errors[] = $this->l('Invalid end date');
|
||||
$this->errors[] = $this->l('Invalid \\"To:\\" date');
|
||||
|
||||
if (!count($this->errors))
|
||||
{
|
||||
|
||||
@@ -92,7 +92,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
$this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?');
|
||||
$this->specificConfirmDelete = $this->l('When you delete a language, all related translations in the database will be deleted. Are you sure you want to delete this language?');
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
@@ -133,7 +133,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
'required' => true,
|
||||
'size' => 2,
|
||||
'maxlength' => 2,
|
||||
'desc' => $this->l('2-letter ISO code (e.g., fr, en, de)')
|
||||
'desc' => $this->l('2-letter ISO code (e.g. fr, en, de)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -142,7 +142,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
'required' => true,
|
||||
'size' => 2,
|
||||
'maxlength' => 5,
|
||||
'desc' => $this->l('Full language code (e.g., en-us, pt-br)')
|
||||
'desc' => $this->l('Full language code (e.g. en-us, pt-br)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -150,7 +150,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
'name' => 'date_format_lite',
|
||||
'required' => true,
|
||||
'size' => 15,
|
||||
'desc' => $this->l('Date format, lite (e.g., Y-m-d, d/m/Y)')
|
||||
'desc' => $this->l('Short date format (e.g. Y-m-d, d/m/Y)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -158,7 +158,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
'name' => 'date_format_full',
|
||||
'required' => true,
|
||||
'size' => 25,
|
||||
'desc' => $this->l('Date format, full (e.g., Y-m-d H:i:s, d/m/Y H:i)')
|
||||
'desc' => $this->l('Full date format (e.g., Y-m-d H:i:s, d/m/Y H:i)')
|
||||
),
|
||||
array(
|
||||
'type' => 'file',
|
||||
@@ -169,10 +169,10 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'file',
|
||||
'label' => $this->l('"No-picture" image:'),
|
||||
'label' => $this->l('\\"No-picture\\" image:'),
|
||||
'name' => 'no-picture',
|
||||
'required' => true,
|
||||
'desc' => $this->l('Image displayed when "no picture found"')
|
||||
'desc' => $this->l('Image displayed when \\"no picture found\\"')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -193,8 +193,8 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('To active if this language is a right to left language').' '.
|
||||
$this->l('(Experimental: your theme must be compliant with RTL language)')
|
||||
'desc' => $this->l('Enable if this language is read from right to left').' '.
|
||||
$this->l('(Experimental: your theme must be compliant with RTL languages)')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -252,7 +252,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
),
|
||||
'list_files' => array(
|
||||
array(
|
||||
'label' => $this->l('Translations files:'),
|
||||
'label' => $this->l('Translation files:'),
|
||||
'files' => Language::getFilesList($obj->iso_code, _THEME_NAME_, false, false, 'tr', true)
|
||||
),
|
||||
array(
|
||||
@@ -286,9 +286,9 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
{
|
||||
// English is needed by the system (ex. translations)
|
||||
if ($object->id == Language::getIdByIso('en'))
|
||||
$this->errors[] = $this->l('You cannot delete the English language as it is a system requirement, you can only deactivate it.');
|
||||
$this->errors[] = $this->l('You cannot delete the English language because it is a system requirement, you can only deactivate it.');
|
||||
if ($object->id == Configuration::get('PS_LANG_DEFAULT'))
|
||||
$this->errors[] = $this->l('you cannot delete the default language');
|
||||
$this->errors[] = $this->l('You cannot delete the default language');
|
||||
else if ($object->id == $this->context->language->id)
|
||||
$this->errors[] = $this->l('You cannot delete the language currently in use. Please change languages before deleting.');
|
||||
else if ($this->deleteNoPictureImages((int)Tools::getValue('id_lang')) && $object->delete())
|
||||
@@ -306,7 +306,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
if ($this->tabAccess['delete'] === '1')
|
||||
{
|
||||
if (in_array(Configuration::get('PS_LANG_DEFAULT'), $_POST[$this->table.'Box']))
|
||||
$this->errors[] = $this->l('you cannot delete the default language');
|
||||
$this->errors[] = $this->l('You cannot delete the default language');
|
||||
else if (in_array($this->context->language->id, $_POST[$this->table.'Box']))
|
||||
$this->errors[] = $this->l('you cannot delete the language currently in use, please change languages before deleting');
|
||||
else
|
||||
@@ -339,7 +339,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
else
|
||||
{
|
||||
$this->validateRules();
|
||||
$this->errors[] = Tools::displayError('Flag and No-Picture image fields are required.');
|
||||
$this->errors[] = Tools::displayError('Flag and \\"No picture\\" image fields are required.');
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -408,20 +408,20 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'.jpg'))
|
||||
$this->errors[] = Tools::displayError('An error occurred while copying no-picture image to your product folder.');
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'c/'.$language.'.jpg'))
|
||||
$this->errors[] = Tools::displayError('An error occurred while copying no-picture image to your category folder.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while copying \\"No picture\\" image to your category folder.');
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'m/'.$language.'.jpg'))
|
||||
$this->errors[] = Tools::displayError('An error occurred while copying no-picture image to your manufacturer folder');
|
||||
$this->errors[] = Tools::displayError('An error occurred while copying \\"No picture\\" image to your manufacturer folder');
|
||||
else
|
||||
{
|
||||
$images_types = ImageType::getImagesTypes('products');
|
||||
foreach ($images_types as $k => $image_type)
|
||||
{
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing no-picture image to your product directory.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing \\"No picture\\" image to your product directory.');
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'c/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing no-picture image to your category directory.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing \\"No picture\\" image to your category directory.');
|
||||
if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'m/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing no-picture image to your manufacturer directory.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while resizing \\"No picture\\" image to your manufacturer directory.');
|
||||
}
|
||||
}
|
||||
unlink($tmp_name);
|
||||
@@ -488,7 +488,7 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
else
|
||||
{
|
||||
$this->status = 'error';
|
||||
$this->errors[] = $this->l('wrong ISO code or lang pack unavailable');
|
||||
$this->errors[] = $this->l('wrong ISO code or language pack unavailable');
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -40,7 +40,7 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_LANG_DEFAULT' => array(
|
||||
'title' => $this->l('Default language:'),
|
||||
'desc' => $this->l('The default language used in shop'),
|
||||
'desc' => $this->l('The default language used in your shop'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'id_lang',
|
||||
@@ -48,7 +48,7 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
),
|
||||
'PS_COUNTRY_DEFAULT' => array(
|
||||
'title' => $this->l('Default country:'),
|
||||
'desc' => $this->l('The default country used in shop'),
|
||||
'desc' => $this->l('The default country used in your shop'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'identifier' => 'id_country',
|
||||
@@ -57,9 +57,9 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
'PS_CURRENCY_DEFAULT' => array(
|
||||
'title' => $this->l('Default currency:'),
|
||||
'desc' =>
|
||||
$this->l('The default currency used in shop')
|
||||
$this->l('The default currency used in your shop')
|
||||
.'<div class="warn">'
|
||||
.$this->l('If you change default currency, you will have to manually edit every product price.')
|
||||
.$this->l('If you change the default currency, you will have to manually edit every product price.')
|
||||
.'</div>',
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
@@ -76,34 +76,34 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_WEIGHT_UNIT' => array(
|
||||
'title' => $this->l('Weight unit:'),
|
||||
'desc' => $this->l('The weight unit of your shop (eg. kg or lbs)'),
|
||||
'desc' => $this->l('The default weight unit for your shop (e.g. kg or lbs)'),
|
||||
'validation' => 'isWeightUnit',
|
||||
'required' => true,
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_DISTANCE_UNIT' => array(
|
||||
'title' => $this->l('Distance unit:'),
|
||||
'desc' => $this->l('The distance unit of your shop (eg. km or mi)'),
|
||||
'desc' => $this->l('The default distance unit for your shop (e.g. km or mi)'),
|
||||
'validation' => 'isDistanceUnit',
|
||||
'required' => true,
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_VOLUME_UNIT' => array(
|
||||
'title' => $this->l('Volume unit:'),
|
||||
'desc' => $this->l('The volume unit of your shop'),
|
||||
'desc' => $this->l('The default volume unit for your shop'),
|
||||
'validation' => 'isWeightUnit',
|
||||
'required' => true,
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_DIMENSION_UNIT' => array(
|
||||
'title' => $this->l('Dimension unit:'),
|
||||
'desc' => $this->l('The dimension unit of your shop (eg. cm or in)'),
|
||||
'desc' => $this->l('The default dimension unit for your shop (e.g. cm or in)'),
|
||||
'validation' => 'isDistanceUnit',
|
||||
'required' => true,
|
||||
'type' => 'text'
|
||||
)
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button')
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button')
|
||||
),
|
||||
'options' => array(
|
||||
'title' => $this->l('Advanced'),
|
||||
@@ -125,13 +125,13 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
)
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button')
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button')
|
||||
)
|
||||
);
|
||||
|
||||
if (function_exists('date_default_timezone_set'))
|
||||
$this->options['general']['fields']['PS_TIMEZONE'] = array(
|
||||
'title' => $this->l('Time Zone:'),
|
||||
'title' => $this->l('Time Zone.'),
|
||||
'validation' => 'isAnything',
|
||||
'type' => 'select',
|
||||
'list' => Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'),
|
||||
@@ -150,10 +150,10 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
$pack = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
|
||||
|
||||
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
|
||||
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
|
||||
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder \\"localization\\")');
|
||||
|
||||
if (!$selection = Tools::getValue('selection'))
|
||||
$this->errors[] = Tools::displayError('Please select at least one content item to import.');
|
||||
$this->errors[] = Tools::displayError('Please select at least one item to import.');
|
||||
else
|
||||
{
|
||||
foreach ($selection as $selected)
|
||||
@@ -222,14 +222,14 @@ class AdminLocalizationControllerCore extends AdminController
|
||||
array(
|
||||
'id' => 'units',
|
||||
'val' => 'units',
|
||||
'name' => $this->l('Units (e.g., weight, volume, distance)')
|
||||
'name' => $this->l('Units (e.g. weight, volume, distance)')
|
||||
)
|
||||
);
|
||||
|
||||
$this->fields_form = array(
|
||||
'tinymce' => true,
|
||||
'legend' => array(
|
||||
'title' => $this->l('Localization pack import'),
|
||||
'title' => $this->l('Import localization pack'),
|
||||
'image' => '../img/admin/localization.gif'
|
||||
),
|
||||
'input' => array(
|
||||
|
||||
@@ -195,7 +195,7 @@ class AdminLoginControllerCore extends AdminController
|
||||
$this->errors[] = Tools::displayError('You can regenerate your password only every').' '.Configuration::get('PS_PASSWD_TIME_BACK').' '.Tools::displayError('minute(s)');
|
||||
}
|
||||
if (_PS_MODE_DEMO_)
|
||||
$errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
|
||||
if (!count($this->errors))
|
||||
{
|
||||
|
||||
@@ -53,7 +53,7 @@ class AdminLogsControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_LOGS_BY_EMAIL' => array(
|
||||
'title' => $this->l('Minimum severity level:'),
|
||||
'desc' => $this->l('Put "5" if you don\'t want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
|
||||
'desc' => $this->l('Enter \\"5\\" if you do not want to receive any e-mails.').'<br />'.$this->l('E-mails will be sent to the shop owner.'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'text',
|
||||
'size' => 5
|
||||
|
||||
@@ -41,21 +41,21 @@ class AdminMaintenanceControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_SHOP_ENABLE' => array(
|
||||
'title' => $this->l('Enable Shop'),
|
||||
'desc' => $this->l('Activate or deactivate your shop. Deactivate your shop while you perform maintenance on it. Please note that the webservice will not be disabled'),
|
||||
'desc' => $this->l('Activate or deactivate your shop. It is a good idea to deactivate your shop while you perform maintenance on it. Please note that the webservice will not be disabled'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_MAINTENANCE_IP' => array(
|
||||
'title' => $this->l('Maintenance IP'),
|
||||
'desc' => $this->l('IP addresses allowed to access the Front Office even if shop is disabled. Use a comma to separate them (e.g., 42.24.4.2,127.0.0.1,99.98.97.96)'),
|
||||
'desc' => $this->l('IP addresses allowed to access the Front Office even if shop is disabled. Use a comma to separate them (e.g. 42.24.4.2,127.0.0.1,99.98.97.96)'),
|
||||
'validation' => 'isGenericName',
|
||||
'type' => 'maintenance_ip',
|
||||
'size' => 30,
|
||||
'default' => ''
|
||||
),
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button'),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'filter_key' => 'a!name'
|
||||
),
|
||||
'postcode' => array(
|
||||
'title' => $this->l('Postcode/ Zip Code'),
|
||||
'title' => $this->l('Postcode / Zip Code'),
|
||||
'align' => 'right',
|
||||
'width' => 50
|
||||
),
|
||||
|
||||
@@ -65,8 +65,8 @@ class AdminMetaControllerCore extends AdminController
|
||||
'mod_rewrite' => $mod_rewrite
|
||||
),
|
||||
'PS_CANONICAL_REDIRECT' => array(
|
||||
'title' => $this->l('Automatically redirect to Canonical url'),
|
||||
'desc' => $this->l('Recommended but your theme must be compliant'),
|
||||
'title' => $this->l('Automatically redirect to Canonical URL'),
|
||||
'desc' => $this->l('Recommended, but your theme must be compliant'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -77,7 +77,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
if ($this->checkConfiguration($this->ht_file))
|
||||
$general_fields['PS_HTACCESS_DISABLE_MULTIVIEWS'] = array(
|
||||
'title' => $this->l('Disable apache multiviews'),
|
||||
'desc' => $this->l('Enable this option only if you have problems with some pages URL rewriting.'),
|
||||
'desc' => $this->l('Enable this option only if you have problems with URL rewriting on some pages.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool',
|
||||
@@ -85,23 +85,23 @@ class AdminMetaControllerCore extends AdminController
|
||||
else
|
||||
{
|
||||
$url_description = $this->l('Before being able to use this tool, you need to:');
|
||||
$url_description .= '<br />- '.$this->l('create a .htaccess blank file your root dir');
|
||||
$url_description .= '<br />- '.$this->l('create a blank .htaccess in your root directory');
|
||||
$url_description .= '<br />- '.$this->l('give it write permissions (CHMOD 666 on Unix system)');
|
||||
}
|
||||
|
||||
// Options to generate robot.txt
|
||||
$robots_description = $this->l('Your file robots.txt MUST be in your website\'s root directory and nowhere else.');
|
||||
$robots_description .= '<br />'.$this->l('eg: http://www.yoursite.com/robots.txt');
|
||||
$robots_description = $this->l('Your robots.txt file MUST be in your website\'s root directory and nowhere else.');
|
||||
$robots_description .= '<br />'.$this->l('e.g. http://www.yoursite.com/robots.txt');
|
||||
if ($this->checkConfiguration($this->rb_file))
|
||||
{
|
||||
$robots_description .= '<br />'.$this->l('Generate your "robots.txt" file by clicking on the following button (this will erase your old robots.txt file):');
|
||||
$robots_description .= '<br />'.$this->l('Generate your \\"robots.txt\\" file by clicking on the following button (this will erase your old robots.txt file):');
|
||||
$robots_submit = array('name' => 'submitRobots', 'title' => $this->l('Generate robots.txt file'));
|
||||
}
|
||||
else
|
||||
{
|
||||
$robots_description .= '<br />'.$this->l('Before being able to use this tool, you need to:');
|
||||
$robots_description .= '<br />- '.$this->l('create a robots.txt blank file in your root dir');
|
||||
$robots_description .= '<br />- '.$this->l(' give it write permissions (CHMOD 666 on Unix system)');
|
||||
$robots_description .= '<br />- '.$this->l('create a blank robots.txt file in your root directory');
|
||||
$robots_description .= '<br />- '.$this->l('give it write permissions (CHMOD 666 on Unix system)');
|
||||
}
|
||||
|
||||
$robots_options = array(
|
||||
@@ -115,7 +115,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
// List of options
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('URLs Setup'),
|
||||
'title' => $this->l('Set up URLs'),
|
||||
'description' => $url_description,
|
||||
'fields' => $general_fields,
|
||||
'submit' => array()
|
||||
@@ -123,7 +123,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
'robots' => $robots_options,
|
||||
'routes' => array(
|
||||
'title' => $this->l('Schema of URLs'),
|
||||
'description' => $this->l('You can change here the pattern of your links. There are some available keywords for each route listed below, keywords with * are required. To add a keyword in URL use {keyword} syntax. You can add some text before or after the keyword IF the keyword is not empty with syntax {prepend:keyword:append}, for example {-hey-:meta_title} will add "-hey-my-title" in URL if meta title is set, or nothing. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
|
||||
'description' => $this->l('Change the pattern of your links. There are some available keywords for each route listed below, keywords with * are required. To add a keyword in your URL use {keyword} syntax. You can add some text before or after the keyword IF the keyword is not empty with syntax {prepend:keyword:append}, for example {-hey-:meta_title} will add \\"-hey-my-title\\" in URL if meta title is set, or nothing. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
|
||||
'fields' => array(),
|
||||
),
|
||||
);
|
||||
@@ -196,7 +196,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Page\'s title:'),
|
||||
'label' => $this->l('Page title:'),
|
||||
'name' => 'title',
|
||||
'lang' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
@@ -209,7 +209,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
'name' => 'description',
|
||||
'lang' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('A short description'),
|
||||
'desc' => $this->l('A short description of your shop'),
|
||||
'size' => 50
|
||||
),
|
||||
array(
|
||||
@@ -218,7 +218,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
'name' => 'keywords',
|
||||
'lang' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('List of keywords'),
|
||||
'desc' => $this->l('List of keywords for search engines'),
|
||||
'size' => 50
|
||||
),
|
||||
array(
|
||||
@@ -228,7 +228,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
'lang' => true,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('Example : "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
|
||||
'desc' => $this->l('e.g. \\"contacts\\" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
|
||||
'size' => 50
|
||||
),
|
||||
),
|
||||
@@ -259,7 +259,7 @@ class AdminMetaControllerCore extends AdminController
|
||||
|
||||
if (!$defaultLangIsValidated && !$englishLangIsValidated)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('Url rewrite field must be filled at least in default or english language.');
|
||||
$this->errors[] = Tools::displayError('URL rewrite field must be filled at least in default or English language.');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ class AdminModulesControllerCore extends AdminController
|
||||
$this->list_modules_categories['export']['name'] = $this->l('Export');
|
||||
$this->list_modules_categories['emailing']['name'] = $this->l('E-mailing');
|
||||
$this->list_modules_categories['front_office_features']['name'] = $this->l('Front Office Features');
|
||||
$this->list_modules_categories['i18n_localization']['name'] = $this->l('I18n & Localization');
|
||||
$this->list_modules_categories['i18n_localization']['name'] = $this->l('Internationalization & Localization');
|
||||
$this->list_modules_categories['merchandizing']['name'] = $this->l('Merchandizing');
|
||||
$this->list_modules_categories['migration_tools']['name'] = $this->l('Migration Tools');
|
||||
$this->list_modules_categories['payments_gateways']['name'] = $this->l('Payments & Gateways');
|
||||
@@ -97,7 +97,7 @@ class AdminModulesControllerCore extends AdminController
|
||||
$this->list_modules_categories['shipping_logistics']['name'] = $this->l('Shipping & Logistics');
|
||||
$this->list_modules_categories['slideshows']['name'] = $this->l('Slideshows');
|
||||
$this->list_modules_categories['smart_shopping']['name'] = $this->l('Smart Shopping');
|
||||
$this->list_modules_categories['market_place']['name'] = $this->l('Market Place');
|
||||
$this->list_modules_categories['market_place']['name'] = $this->l('Marketplace');
|
||||
$this->list_modules_categories['social_networks']['name'] = $this->l('Social Networks');
|
||||
$this->list_modules_categories['others']['name'] = $this->l('Other Modules');
|
||||
|
||||
@@ -512,7 +512,7 @@ class AdminModulesControllerCore extends AdminController
|
||||
// PrestaShop demo mode
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -724,7 +724,7 @@ class AdminModulesControllerCore extends AdminController
|
||||
{
|
||||
// If error during module installation, no redirection
|
||||
$html_error = $this->generateHtmlMessage($module_errors);
|
||||
$this->errors[] = sprintf(Tools::displayError('The following module(s) were not installed successfully: %s'), $html_error);
|
||||
$this->errors[] = sprintf(Tools::displayError('The following module(s) were not installed properly: %s'), $html_error);
|
||||
}
|
||||
}
|
||||
if ($return)
|
||||
@@ -804,7 +804,7 @@ class AdminModulesControllerCore extends AdminController
|
||||
$this->translationsTab['Reset'] = $this->l('Reset');
|
||||
$this->translationsTab['Configure'] = $this->l('Configure');
|
||||
$this->translationsTab['Delete'] = $this->l('Delete');
|
||||
$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this ?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this ?');
|
||||
$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this ?');
|
||||
}
|
||||
|
||||
$return = '';
|
||||
@@ -1021,8 +1021,8 @@ class AdminModulesControllerCore extends AdminController
|
||||
{
|
||||
$object = new $module->name();
|
||||
$module_success[] = array('name' => $module->name, 'message' => array(
|
||||
0 => $this->l('Current version: ').$object->version,
|
||||
1 => $this->l('No files upgrade applied (none exist)'))
|
||||
0 => $this->l('Current version:').$object->version,
|
||||
1 => $this->l('No file upgrades applied (none exist)'))
|
||||
);
|
||||
unset($object);
|
||||
}
|
||||
|
||||
@@ -71,9 +71,9 @@ class AdminModulesPositionsControllerCore extends AdminController
|
||||
elseif (!$id_hook || !Validate::isLoadedObject($hook))
|
||||
$this->errors[] = Tools::displayError('Hook cannot be loaded.');
|
||||
elseif (Hook::getModulesFromHook($id_hook, $id_module))
|
||||
$this->errors[] = Tools::displayError('This module is already transplanted to this hook.');
|
||||
$this->errors[] = Tools::displayError('This module is already transplanted to this hook');
|
||||
elseif (!$module->isHookableOn($hook->name))
|
||||
$this->errors[] = Tools::displayError('This module can\'t be transplanted to this hook.');
|
||||
$this->errors[] = Tools::displayError('This module cannot be transplanted to this hook.');
|
||||
// Adding vars...
|
||||
else
|
||||
{
|
||||
|
||||
@@ -86,7 +86,7 @@ class AdminOrderMessageControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save '),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
|
||||
@@ -75,7 +75,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_GUEST_CHECKOUT_ENABLED' => array(
|
||||
'title' => $this->l('Enable guest checkout'),
|
||||
'desc' => $this->l('Your guest can make an order without registering'),
|
||||
'desc' => $this->l('Guest can place an order without registering'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -89,14 +89,14 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_ALLOW_MULTISHIPPING' => array(
|
||||
'title' => $this->l('Allow multi-shipping'),
|
||||
'desc' => $this->l('Allow the customer to ship his order to multiple addresses. This option will transform the customer cart in one or more orders.'),
|
||||
'desc' => $this->l('Allow the customer to ship his order to multiple addresses. This option will convert the customer\'s cart into one or more orders.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_SHIP_WHEN_AVAILABLE' => array(
|
||||
'title' => $this->l('Delayed shipping'),
|
||||
'desc' => $this->l('Allow the customer to split his order. One with the products "in stock", and an other with the other products. This option will transform the customer cart in two orders.'),
|
||||
'desc' => $this->l('Allow the customer to split his order: one with the products currently \\"in stock\\", and another with the other products. This option will convert the customer\'s cart into two orders.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -122,7 +122,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
'cast' => 'intval'
|
||||
),
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button'),
|
||||
),
|
||||
'gift' => array(
|
||||
'title' => $this->l('Gift options'),
|
||||
@@ -159,7 +159,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
'type' => 'bool'
|
||||
),
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button'),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
'show_toolbar' => $this->show_toolbar,
|
||||
'toolbar_btn' => $this->toolbar_btn,
|
||||
'toolbar_scroll' => $this->toolbar_scroll,
|
||||
'title' => $this->l('Orders : create order'),
|
||||
'title' => $this->l('Orders: create order'),
|
||||
));
|
||||
$this->content .= $this->createTemplate('form.tpl')->fetch();
|
||||
}
|
||||
@@ -286,7 +286,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('An error occurred while sending e-mail to customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while sending e-mail to the customer.');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('Order carrier can\'t be updated');
|
||||
@@ -337,7 +337,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$this->errors[] = Tools::displayError('An error occurred while changing the status or was unable to send e-mail to the customer.');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('This order has already this status');
|
||||
$this->errors[] = Tools::displayError('This order is already assigned this status');
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -397,7 +397,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$customer_message->private = Tools::getValue('visibility');
|
||||
|
||||
if (!$customer_message->add())
|
||||
$this->errors[] = Tools::displayError('An error occurred while saving message.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while saving message');
|
||||
elseif ($customer_message->private)
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$order->id.'&vieworder&conf=11&token='.$this->token);
|
||||
else
|
||||
@@ -417,7 +417,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$customer->firstname.' '.$customer->lastname, null, null, null, null, _PS_MAIL_DIR_, true))
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=11'.'&token='.$this->token);
|
||||
}
|
||||
$this->errors[] = Tools::displayError('An error occurred while sending e-mail to customer.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while sending e-mail to the customer.');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -458,7 +458,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=24&token='.$this->token);
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('Partial refund data are incorrect');
|
||||
$this->errors[] = Tools::displayError('Partial refund data is incorrect');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You do not have permission to delete here.');
|
||||
@@ -640,7 +640,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if (Tools::isSubmit('generateDiscount') && !count($this->errors))
|
||||
{
|
||||
// @todo generate a voucher using cartrules
|
||||
if (true || !$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip concerning the order #'), Tools::isSubmit('shippingBack')))
|
||||
if (true || !$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip for order #'), Tools::isSubmit('shippingBack')))
|
||||
$this->errors[] = Tools::displayError('Cannot generate voucher');
|
||||
else
|
||||
{
|
||||
@@ -695,7 +695,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
else
|
||||
{
|
||||
if (!$order->addOrderPayment($amount, Tools::getValue('payment_method'), Tools::getValue('payment_transaction_id'), $currency, Tools::getValue('payment_date'), $order_invoice))
|
||||
$this->errors[] = Tools::displayError('An error occurred on adding of order payment');
|
||||
$this->errors[] = Tools::displayError('An error occurred on adding order payment');
|
||||
else
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
|
||||
}
|
||||
@@ -818,7 +818,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$order->update();
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You can\'t change the currency');
|
||||
$this->errors[] = Tools::displayError('You cannot change the currency');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
|
||||
@@ -826,7 +826,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
elseif (Tools::isSubmit('submitGenerateInvoice') && isset($order))
|
||||
{
|
||||
if ($order->hasInvoice())
|
||||
$this->errors[] = Tools::displayError('This order has already invoice');
|
||||
$this->errors[] = Tools::displayError('This order already has an invoice');
|
||||
else
|
||||
{
|
||||
$order->setInvoice();
|
||||
@@ -872,7 +872,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('Can\'t edit this Order Cart Rule');
|
||||
$this->errors[] = Tools::displayError('Cannot edit this Order Cart Rule');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
|
||||
@@ -937,7 +937,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if (isset($order_invoice))
|
||||
{
|
||||
if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl)
|
||||
$this->errors[] = Tools::displayError('Discount value is superior than the order invoice total');
|
||||
$this->errors[] = Tools::displayError('Discount value is greater than the order invoice total');
|
||||
else
|
||||
{
|
||||
$cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
|
||||
@@ -953,7 +953,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
foreach ($order_invoices_collection as $order_invoice)
|
||||
{
|
||||
if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl)
|
||||
$this->errors[] = Tools::displayError('Discount value is superior than the order invoice total (Invoice: ').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id).')';
|
||||
$this->errors[] = Tools::displayError('Discount value is greater than the order invoice total (Invoice:').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id).')';
|
||||
else
|
||||
{
|
||||
$cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
|
||||
@@ -967,7 +967,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
else
|
||||
{
|
||||
if (Tools::getValue('discount_value') > $order->total_paid_tax_incl)
|
||||
$this->errors[] = Tools::displayError('Discount value is superior than the order total');
|
||||
$this->errors[] = Tools::displayError('Discount value is greater than the order total');
|
||||
else
|
||||
{
|
||||
$cart_rules[0]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
|
||||
@@ -1063,7 +1063,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if ($res)
|
||||
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
|
||||
else
|
||||
$this->errors[] = Tools::displayError('An error occured on OrderCartRule creation');
|
||||
$this->errors[] = Tools::displayError('An error occurred on OrderCartRule creation');
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1285,7 +1285,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
die(Tools::jsonEncode(array('errors' => false, 'result' => $this->l('The mail was sent to your customer.'))));
|
||||
}
|
||||
}
|
||||
$this->content = Tools::jsonEncode(array('errors' => true, 'result' => $this->l('Error in sending the email to your customer.')));
|
||||
$this->content = Tools::jsonEncode(array('errors' => true, 'result' => $this->l('Error in sending the e-mail to your customer.')));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1675,7 +1675,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if (!$res)
|
||||
die(Tools::jsonEncode(array(
|
||||
'result' => $res,
|
||||
'error' => Tools::displayError('Error occured on edition of this product line')
|
||||
'error' => Tools::displayError('Error occurred while editing this product line')
|
||||
)));
|
||||
|
||||
die(Tools::jsonEncode(array(
|
||||
@@ -1725,7 +1725,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if (!$res)
|
||||
die(Tools::jsonEncode(array(
|
||||
'result' => $res,
|
||||
'error' => Tools::displayError('Error occured on deletion of this product line')
|
||||
'error' => Tools::displayError('Error occurred on deletion of this product line')
|
||||
)));
|
||||
|
||||
// Get invoices collection
|
||||
@@ -1787,7 +1787,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if ($order->hasBeenDelivered())
|
||||
die(Tools::jsonEncode(array(
|
||||
'result' => false,
|
||||
'error' => Tools::displayError('Can\'t edit an delivered order')
|
||||
'error' => Tools::displayError('Can\'t edit a delivered order')
|
||||
)));
|
||||
|
||||
if (!empty($order_invoice) && $order_invoice->id_order != Tools::getValue('id_order'))
|
||||
@@ -1837,7 +1837,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
if ($order->hasBeenDelivered())
|
||||
die(Tools::jsonEncode(array(
|
||||
'result' => false,
|
||||
'error' => Tools::displayError('Can\'t edit an delivered order')
|
||||
'error' => Tools::displayError('Can\'t edit a delivered order')
|
||||
)));
|
||||
}
|
||||
|
||||
|
||||
@@ -40,29 +40,29 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_CATALOG_MODE' => array(
|
||||
'title' => $this->l('Catalog mode:'),
|
||||
'desc' => $this->l('When active, all features for shopping will be disabled'),
|
||||
'desc' => $this->l('When active, all shopping features will be disabled'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'required' => false,
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_COMPARATOR_MAX_ITEM' => array(
|
||||
'title' => $this->l('Max items in the comparator:'),
|
||||
'desc' => $this->l('Specify here the threshold from which be displayed a message announcing an upcoming out of stock.').' '.$this->l('Set to 0 to disable this feature'),
|
||||
'title' => $this->l('Maximum number of items for comparison:'),
|
||||
'desc' => $this->l('Set the threshold at which a message will announce the product is close to being out of stock.').' '.$this->l('Set to 0 to disable this feature'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'required' => true,
|
||||
'cast' => 'intval',
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_NB_DAYS_NEW_PRODUCT' => array(
|
||||
'title' => $this->l('Number of days during which the product is considered \'new\':'),
|
||||
'title' => $this->l('Number of days for which the product is considered \'new\':'),
|
||||
'validation' => 'isUnsignedInt',
|
||||
'cast' => 'intval',
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_CART_REDIRECT' => array(
|
||||
'title' => $this->l('Re-direction after adding product to cart:'),
|
||||
'desc' => $this->l('Concerns only the non-AJAX version of the cart'),
|
||||
'title' => $this->l('Redirection after adding product to cart:'),
|
||||
'desc' => $this->l('Only for non-AJAX version of the cart'),
|
||||
'cast' => 'intval',
|
||||
'show' => true,
|
||||
'required' => false,
|
||||
@@ -75,7 +75,7 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_PRODUCT_SHORT_DESC_LIMIT' => array(
|
||||
'title' => $this->l('Short description max size'),
|
||||
'desc' => $this->l('Set the maximum size of product short description'),
|
||||
'desc' => $this->l('Set the maximum size of product short description (in characters)'),
|
||||
'validation' => 'isInt',
|
||||
'cast' => 'intval',
|
||||
'type' => 'text',
|
||||
@@ -101,14 +101,14 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_PRODUCTS_PER_PAGE' => array(
|
||||
'title' => $this->l('Products per page:'),
|
||||
'desc' => $this->l('Products displayed per page. Default is 10.'),
|
||||
'desc' => $this->l('Number of products displayed per page. Default is 10.'),
|
||||
'validation' => 'isUnsignedInt',
|
||||
'cast' => 'intval',
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_PRODUCTS_ORDER_BY' => array(
|
||||
'title' => $this->l('Default order by:'),
|
||||
'desc' => $this->l('Default order by for product list'),
|
||||
'desc' => $this->l('The order in which products are displayed in the product list'),
|
||||
'type' => 'select',
|
||||
'list' => array(
|
||||
array('id' => '0', 'name' => $this->l('Product name')),
|
||||
@@ -121,8 +121,8 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'identifier' => 'id'
|
||||
),
|
||||
'PS_PRODUCTS_ORDER_WAY' => array(
|
||||
'title' => $this->l('Default order way:'),
|
||||
'desc' => $this->l('Default order way for product list'),
|
||||
'title' => $this->l('Default order method:'),
|
||||
'desc' => $this->l('Default order method for product list'),
|
||||
'type' => 'select',
|
||||
'list' => array(
|
||||
array(
|
||||
@@ -150,7 +150,7 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_LAST_QTIES' => array(
|
||||
'title' => $this->l('Display last quantities when qty is lower than:'),
|
||||
'title' => $this->l('Display remaining quantities when qty is lower than:'),
|
||||
'desc' => $this->l('Set to 0 to disable this feature'),
|
||||
'validation' => 'isUnsignedId',
|
||||
'required' => true,
|
||||
@@ -174,8 +174,8 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_ATTRIBUTE_CATEGORY_DISPLAY' => array(
|
||||
'title' => $this->l('Display "add to cart" button when product has attributes:'),
|
||||
'desc' => $this->l('Display or hide the "add to cart" button on category pages for products that have attributes to force customers to see the product detail'),
|
||||
'title' => $this->l('Display \\"add to cart\\" button when product has attributes:'),
|
||||
'desc' => $this->l('Display or hide the \\"add to cart\\" button on category pages for products that have attributes to force customers to see the product detail'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
@@ -186,7 +186,7 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
'title' => $this->l('Products stock'),
|
||||
'fields' => array(
|
||||
'PS_ORDER_OUT_OF_STOCK' => array(
|
||||
'title' => $this->l('Allow ordering out-of-stock product:'),
|
||||
'title' => $this->l('Allow ordering of out-of-stock products:'),
|
||||
'desc' => $this->l('Add to cart button is hidden when product is unavailable'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
@@ -207,7 +207,7 @@ class AdminPPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_ADVANCED_STOCK_MANAGEMENT' => array(
|
||||
'title' => $this->l('Enable advanced stock management:'),
|
||||
'desc' => $this->l('Allows you to manage a physical stock, warehouses and supply orders.'),
|
||||
'desc' => $this->l('Allows you to manage physical stock, warehouses and supply orders.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'required' => false,
|
||||
|
||||
@@ -127,7 +127,7 @@ class AdminPaymentControllerCore extends AdminController
|
||||
|
||||
public function renderView()
|
||||
{
|
||||
$this->toolbar_title = $this->l('Paiement');
|
||||
$this->toolbar_title = $this->l('Payment');
|
||||
unset($this->toolbar_btn['back']);
|
||||
|
||||
$shop_context = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP);
|
||||
@@ -151,21 +151,21 @@ class AdminPaymentControllerCore extends AdminController
|
||||
|
||||
$lists = array('currencies' =>
|
||||
array('items' => Currency::getCurrencies(),
|
||||
'title' => $this->l('Currencies restrictions'),
|
||||
'title' => $this->l('Currency restrictions'),
|
||||
'desc' => $this->l('Please mark the checkbox(es) for the currency or currencies for which you want the payment module(s) to be available.'),
|
||||
'name_id' => 'currency',
|
||||
'identifier' => 'id_currency',
|
||||
'icon' => 'dollar',
|
||||
),
|
||||
array('items' => Group::getGroups($this->context->language->id),
|
||||
'title' => $this->l('Groups restrictions'),
|
||||
'title' => $this->l('Group restrictions'),
|
||||
'desc' => $this->l('Please mark the checkbox(es) for the groups for which you want the payment module(s) available.'),
|
||||
'name_id' => 'group',
|
||||
'identifier' => 'id_group',
|
||||
'icon' => 'group',
|
||||
),
|
||||
array('items' =>Country::getCountries($this->context->language->id),
|
||||
'title' => $this->l('Countries restrictions'),
|
||||
'title' => $this->l('Country restrictions'),
|
||||
'desc' => $this->l('Please mark the checkbox(es) for the country or countries for which you want the payment module(s) to be available.'),
|
||||
'name_id' => 'country',
|
||||
'identifier' => 'id_country',
|
||||
|
||||
@@ -50,18 +50,18 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
|
||||
'value' => _PS_SMARTY_NO_COMPILE_,
|
||||
'label' => $this->l('Never compile cache'),
|
||||
'desc' => $this->l('Templates are never recompiled, performance are better and this option should be used in production environement')
|
||||
'desc' => $this->l('Templates are never recompiled, performance is better and this option should be used in production environment')
|
||||
),
|
||||
array(
|
||||
'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
|
||||
'value' => _PS_SMARTY_CHECK_COMPILE_,
|
||||
'label' => $this->l('Compile cache if templates are updated'),
|
||||
'desc' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles when you update your templates files, you should use force compile instead of this option. It should never be used in a production environment.')
|
||||
'desc' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles when you update your template files, you should use Force Compile instead of this option. It should never be used in a production environment.')
|
||||
),
|
||||
array(
|
||||
'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
|
||||
'value' => _PS_SMARTY_FORCE_COMPILE_,
|
||||
'label' => $this->l('Force compile'),
|
||||
'label' => $this->l('Force Compile'),
|
||||
'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. It should never be used in a production environment.')
|
||||
)
|
||||
)
|
||||
@@ -96,7 +96,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
array(
|
||||
'id' => 'smarty_console_none',
|
||||
'value' => 0,
|
||||
'label' => $this->l('Not open console')
|
||||
'label' => $this->l('Do not open console')
|
||||
),
|
||||
array(
|
||||
'id' => 'smarty_console_url',
|
||||
@@ -108,7 +108,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'id' => 'smarty_console_open',
|
||||
'value' => 2,
|
||||
'label' => $this->l('Always open console'),
|
||||
'desc' => $this->l('To always force open the debug console choose this option.')
|
||||
'desc' => $this->l('Choose this option to always force the debug console to open.')
|
||||
)
|
||||
)
|
||||
),
|
||||
@@ -124,7 +124,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
{
|
||||
$this->fields_form[1]['form'] = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Features detachables'),
|
||||
'title' => $this->l('Optional features'),
|
||||
'image' => '../img/admin/tab-plugins.gif'
|
||||
),
|
||||
'desc' => $this->l('Some features can be disabled in order to improve performance.'),
|
||||
@@ -135,7 +135,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Combination:'),
|
||||
'label' => $this->l('Combinations:'),
|
||||
'name' => 'combination',
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
@@ -152,11 +152,11 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('These features are going to be disabled:')
|
||||
'desc' => $this->l('These features will be disabled:')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Feature:'),
|
||||
'label' => $this->l('Features:'),
|
||||
'name' => 'feature',
|
||||
'class' => 't',
|
||||
'is_bool' => true,
|
||||
@@ -172,7 +172,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('These features are going to be disabled:')
|
||||
'desc' => $this->l('These features will be disabled:')
|
||||
)
|
||||
)
|
||||
);
|
||||
@@ -242,7 +242,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
array(
|
||||
'id' => 'PS_HTML_THEME_COMPRESSION_1',
|
||||
'value' => 1,
|
||||
'label' => $this->l('Minify HTML after "smarty compile" execution.')
|
||||
'label' => $this->l('Minify HTML after \\"smarty compile\\" execution.')
|
||||
),
|
||||
array(
|
||||
'id' => 'PS_HTML_THEME_COMPRESSION_0',
|
||||
@@ -261,7 +261,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
array(
|
||||
'id' => 'PS_JS_HTML_THEME_COMPRESSION_1',
|
||||
'value' => 1,
|
||||
'label' => $this->l('Compress inline JavaScript in HTML after "smarty compile" execution')
|
||||
'label' => $this->l('Compress inline JavaScript in HTML after \\"smarty compile\\" execution')
|
||||
),
|
||||
array(
|
||||
'id' => 'PS_JS_HTML_THEME_COMPRESSION_0',
|
||||
@@ -280,7 +280,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
array(
|
||||
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_1',
|
||||
'value' => 1,
|
||||
'label' => $this->l('HTML is compressed but cancels the W3C validation (only when "Minify HTML" is enabled)')
|
||||
'label' => $this->l('HTML is compressed but cancels the W3C validation (only when \\"Minify HTML\\" is enabled)')
|
||||
),
|
||||
array(
|
||||
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_0',
|
||||
@@ -325,7 +325,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
{
|
||||
$this->fields_form[3]['form'] = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Media servers (used only with CCC)'),
|
||||
'title' => $this->l('Media servers (use only with CCC)'),
|
||||
'image' => '../img/admin/subdomain.gif'
|
||||
),
|
||||
'desc' => $this->l('You must enter another domain or subdomain in order to use cookieless static content.'),
|
||||
@@ -339,21 +339,21 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'label' => $this->l('Media server #1:'),
|
||||
'name' => '_MEDIA_SERVER_1_',
|
||||
'size' => 30,
|
||||
'desc' => $this->l('Name of the second domain of your shop, (e.g., myshop-media-server-1.com). If you do not have another domain, leave this field blank')
|
||||
'desc' => $this->l('Name of the second domain of your shop, (e.g. myshop-media-server-1.com). If you do not have another domain, leave this field blank')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Media server #2:'),
|
||||
'name' => '_MEDIA_SERVER_2_',
|
||||
'size' => 30,
|
||||
'desc' => $this->l('Name of the third domain of your shop, (e.g., myshop-media-server-2.com). If you do not have another domain, leave this field blank')
|
||||
'desc' => $this->l('Name of the third domain of your shop, (e.g. myshop-media-server-2.com). If you do not have another domain, leave this field blank')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Media server #3:'),
|
||||
'name' => '_MEDIA_SERVER_3_',
|
||||
'size' => 30,
|
||||
'desc' => $this->l('Name of the fourth domain of your shop, (e.g., myshop-media-server-3.com). If you do not have another domain, leave this field blank')
|
||||
'desc' => $this->l('Name of the fourth domain of your shop, (e.g. myshop-media-server-3.com). If you do not have another domain, leave this field blank')
|
||||
),
|
||||
)
|
||||
);
|
||||
@@ -370,7 +370,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
'title' => $this->l('Ciphering'),
|
||||
'image' => '../img/admin/computer_key.png'
|
||||
),
|
||||
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
|
||||
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension \\"mcrypt\\". If you change this configuration, all cookies will be reset.'),
|
||||
'input' => array(
|
||||
array(
|
||||
'type' => 'hidden',
|
||||
@@ -513,7 +513,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
<a href="http://xcache.lighttpd.net">http://xcache.lighttpd.net</a>';
|
||||
|
||||
if (!is_writable(_PS_CACHEFS_DIRECTORY_))
|
||||
$this->warnings[] = $this->l('To use CacheFS the directory').' '.realpath(_PS_CACHEFS_DIRECTORY_).' '.$this->l('must be writable');
|
||||
$this->warnings[] = $this->l('To use the CacheFS directory').' '.realpath(_PS_CACHEFS_DIRECTORY_).' '.$this->l('must be writable');
|
||||
|
||||
$this->initToolbar();
|
||||
$this->display = '';
|
||||
@@ -657,7 +657,7 @@ class AdminPerformanceControllerCore extends AdminController
|
||||
if ($algo)
|
||||
{
|
||||
if (!function_exists('mcrypt_encrypt'))
|
||||
$this->errors[] = Tools::displayError('Mcrypt is not activated on this server.');
|
||||
$this->errors[] = Tools::displayError('PHP \\"Mcrypt\\" extension is not activated on this server.');
|
||||
else
|
||||
{
|
||||
if (!strstr($settings, '_RIJNDAEL_KEY_'))
|
||||
|
||||
@@ -83,7 +83,7 @@ class AdminPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_DISPLAY_SUPPLIERS' => array(
|
||||
'title' => $this->l('Display suppliers and manufacturers'),
|
||||
'desc' => $this->l('Display manufacturers and suppliers list even if corresponding blocks are disabled'),
|
||||
'desc' => $this->l('Display suppliers and manufacturers list even if corresponding blocks are disabled'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
|
||||
@@ -134,7 +134,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
'align' => 'right',
|
||||
'filter_key' => 'sav!quantity',
|
||||
'orderby' => true,
|
||||
'hint' => $this->l('This is the availble quantity in the current shop/group'),
|
||||
'hint' => $this->l('This is the quantity available in the current shop/group'),
|
||||
),
|
||||
'active' => array(
|
||||
'title' => $this->l('Displayed'),
|
||||
@@ -337,14 +337,14 @@ class AdminProductsControllerCore extends AdminController
|
||||
$this->errors[] = Tools::displayError('Invalid description');
|
||||
}
|
||||
if (!$is_attachment_name_valid)
|
||||
$this->errors[] = Tools::displayError('Attachment Name Required');
|
||||
$this->errors[] = Tools::displayError('Attachment name required');
|
||||
|
||||
if (empty($this->errors))
|
||||
{
|
||||
if (isset($_FILES['attachment_file']) && is_uploaded_file($_FILES['attachment_file']['tmp_name']))
|
||||
{
|
||||
if ($_FILES['attachment_file']['size'] > (Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024 * 1024))
|
||||
$this->errors[] = $this->l('File too large, maximum size allowed:').' '.(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024).' '.$this->l('kb').'. '.$this->l('File size you\'re trying to upload is:').number_format(($_FILES['attachment_file']['size'] / 1024), 2, '.', '').$this->l('kb');
|
||||
$this->errors[] = $this->l('File too large, maximum size allowed:').' '.(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024).' '.$this->l('kB').'. '.$this->l('File size you\'re trying to upload is:').number_format(($_FILES['attachment_file']['size'] / 1024), 2, '.', '').$this->l('kB');
|
||||
else
|
||||
{
|
||||
do $uniqid = sha1(microtime());
|
||||
@@ -359,7 +359,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$max_upload = (int)ini_get('upload_max_filesize');
|
||||
$max_post = (int)ini_get('post_max_size');
|
||||
$upload_mb = min($max_upload, $max_post);
|
||||
$this->errors[] = $this->l('the File').' <b>'.$_FILES['attachment_file']['name'].'</b> '.$this->l('exceeds the size allowed by the server, this limit is set to').' <b>'.$upload_mb.$this->l('Mb').'</b>';
|
||||
$this->errors[] = $this->l('the File').' <b>'.$_FILES['attachment_file']['name'].'</b> '.$this->l('exceeds the size allowed by the server, this limit is set to').' <b>'.$upload_mb.$this->l('MB').'</b>';
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('File is missing');
|
||||
@@ -510,7 +510,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
Image::deleteCover($image->id_product);
|
||||
$image->cover = 1;
|
||||
if (!$image->update())
|
||||
$this->errors[] = Tools::displayError('Cannot change the product cover');
|
||||
$this->errors[] = Tools::displayError('Cannot change the product cover image');
|
||||
else
|
||||
{
|
||||
$productId = (int)Tools::getValue('id_product');
|
||||
@@ -823,7 +823,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
}
|
||||
}
|
||||
else
|
||||
$error = Tools::displayError('You do not have permission to delete here.');
|
||||
$error = Tools::displayError('You do not have permission to delete this.');
|
||||
|
||||
if (isset($error))
|
||||
$json = array(
|
||||
@@ -1334,13 +1334,13 @@ class AdminProductsControllerCore extends AdminController
|
||||
protected function _validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $id_customer, $price, $from_quantity, $reduction, $reduction_type, $from, $to, $id_combination = 0)
|
||||
{
|
||||
if (!Validate::isUnsignedId($id_shop) || !Validate::isUnsignedId($id_currency) || !Validate::isUnsignedId($id_country) || !Validate::isUnsignedId($id_group) || !Validate::isUnsignedId($id_customer))
|
||||
$this->errors[] = Tools::displayError('Wrong ID\'s');
|
||||
$this->errors[] = Tools::displayError('Wrong IDs');
|
||||
elseif ((empty($price) && empty($reduction)) || (!empty($price) && !Validate::isPrice($price)) || (!empty($reduction) && !Validate::isPrice($reduction)))
|
||||
$this->errors[] = Tools::displayError('Invalid price/reduction amount');
|
||||
$this->errors[] = Tools::displayError('Invalid price/discount amount');
|
||||
elseif (!Validate::isUnsignedInt($from_quantity))
|
||||
$this->errors[] = Tools::displayError('Invalid quantity');
|
||||
elseif ($reduction && !Validate::isReductionType($reduction_type))
|
||||
$this->errors[] = Tools::displayError('Please select a reduction type (amount or percentage)');
|
||||
$this->errors[] = Tools::displayError('Please select a discount type (amount or percentage)');
|
||||
elseif ($from && $to && (!Validate::isDateFormat($from) || !Validate::isDateFormat($to)))
|
||||
$this->errors[] = Tools::displayError('Wrong from/to date');
|
||||
elseif (SpecificPrice::exists((int)$this->object->id, $id_combination, $id_shop, $id_group, $id_country, $id_currency, $id_customer, $from_quantity, $from, $to))
|
||||
@@ -1627,18 +1627,18 @@ class AdminProductsControllerCore extends AdminController
|
||||
{
|
||||
if (Tools::getValue('id_'.$this->table) && $field == 'passwd')
|
||||
continue;
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is required');
|
||||
}
|
||||
|
||||
/* Check multilingual required fields */
|
||||
foreach ($rules['requiredLang'] as $fieldLang)
|
||||
if (!Tools::getValue($fieldLang.'_'.$default_language->id))
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).'</b> '.$this->l('is required at least in').' '.$default_language->name;
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).'</b> '.$this->l('is required at least in').' '.$default_language->name;
|
||||
|
||||
/* Check fields sizes */
|
||||
foreach ($rules['size'] as $field => $maxLength)
|
||||
if ($value = Tools::getValue($field) && Tools::strlen($value) > $maxLength)
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max').')';
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max').')';
|
||||
|
||||
if (Tools::getIsset('description_short'))
|
||||
{
|
||||
@@ -1652,12 +1652,12 @@ class AdminProductsControllerCore extends AdminController
|
||||
foreach ($languages as $language)
|
||||
if ($value = Tools::getValue('description_short_'.$language['id_lang']))
|
||||
if (Tools::strlen(strip_tags($value)) > $limit)
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), 'description_short').' ('.$language['name'].')</b> '.$this->l('is too long').' : '.$limit.' '.$this->l('chars max').' ('.$this->l('count now').' '.Tools::strlen(strip_tags($value)).')';
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), 'description_short').' ('.$language['name'].')</b> '.$this->l('is too long').' : '.$limit.' '.$this->l('chars max').' ('.$this->l('count now').' '.Tools::strlen(strip_tags($value)).')';
|
||||
/* Check multilingual fields sizes */
|
||||
foreach ($rules['sizeLang'] as $fieldLang => $maxLength)
|
||||
foreach ($languages as $language)
|
||||
if ($value = Tools::getValue($fieldLang.'_'.$language['id_lang']) && Tools::strlen($value) > $maxLength)
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max').')';
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is too long').' ('.$maxLength.' '.$this->l('chars max').')';
|
||||
if (isset($_POST['description_short']))
|
||||
$_POST['description_short'] = $saveShort;
|
||||
|
||||
@@ -1665,14 +1665,14 @@ class AdminProductsControllerCore extends AdminController
|
||||
foreach ($rules['validate'] as $field => $function)
|
||||
if ($value = Tools::getValue($field))
|
||||
if (!Validate::$function($value))
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is invalid');
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $field, $className).'</b> '.$this->l('is invalid');
|
||||
|
||||
/* Check multilingual fields validity */
|
||||
foreach ($rules['validateLang'] as $fieldLang => $function)
|
||||
foreach ($languages as $language)
|
||||
if ($value = Tools::getValue($fieldLang.'_'.$language['id_lang']))
|
||||
if (!Validate::$function($value))
|
||||
$this->errors[] = $this->l('the field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is invalid');
|
||||
$this->errors[] = $this->l('this field').' <b>'.call_user_func(array($className, 'displayFieldName'), $fieldLang, $className).' ('.$language['name'].')</b> '.$this->l('is invalid');
|
||||
|
||||
/* Categories */
|
||||
$productCats = '';
|
||||
@@ -1722,12 +1722,12 @@ class AdminProductsControllerCore extends AdminController
|
||||
{
|
||||
if (!Tools::getValue('virtual_product_name_attribute') && !empty($id_product_attribute))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('display filename attribute').'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('display filename attribute').'</b> '.$this->l('is required');
|
||||
return false;
|
||||
}
|
||||
elseif (!empty($id_product_attribute))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('display filename').'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('display filename').'</b> '.$this->l('is required');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1741,13 +1741,13 @@ class AdminProductsControllerCore extends AdminController
|
||||
{
|
||||
if (!empty($edit) && !empty($id_product_attribute))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('number of days attribute').'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('number of days attribute').'</b> '.$this->l('is required');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
elseif (!empty($id_product_attribute))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('number of days').'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('number of days').'</b> '.$this->l('is required');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1760,12 +1760,12 @@ class AdminProductsControllerCore extends AdminController
|
||||
{
|
||||
if (!Tools::getValue('virtual_product_expiration_date_attribute'))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('expiration date attribute').'</b> '.$this->l('is required');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('expiration date attribute').'</b> '.$this->l('is required');
|
||||
return false;
|
||||
}
|
||||
elseif (!empty($id_product_attribute))
|
||||
{
|
||||
$this->errors[] = $this->l('the field').' <b>'.$this->l('expiration date').'</b> '.$this->l('is not valid');
|
||||
$this->errors[] = $this->l('this field').' <b>'.$this->l('expiration date').'</b> '.$this->l('is not valid');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -2055,7 +2055,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$content = '<div class="warn draft" style="'.($active ? 'display:none' : '').'">
|
||||
<p>
|
||||
<span style="float: left">
|
||||
'.$this->l('Your product will be saved as draft').'
|
||||
'.$this->l('Your product will be saved as a draft').'
|
||||
</span>
|
||||
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
|
||||
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
|
||||
@@ -2544,7 +2544,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
));
|
||||
}
|
||||
else
|
||||
$this->displayWarning($this->l('You must save this product before manage accounting.'));
|
||||
$this->displayWarning($this->l('You must save this product before managing accounting.'));
|
||||
|
||||
$this->tpl_form_vars['custom_form'] = $data->fetch();
|
||||
}
|
||||
@@ -2751,7 +2751,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
if (!file_exists($exists_file)
|
||||
&& !empty($product->productDownload->display_filename)
|
||||
&& !empty($product->cache_default_attribute))
|
||||
$msg = sprintf(Tools::displayError('This file "%s" is missing'), $product->productDownload->display_filename);
|
||||
$msg = sprintf(Tools::displayError('This file \\"%s\\" is missing'), $product->productDownload->display_filename);
|
||||
else
|
||||
$msg = '';
|
||||
|
||||
@@ -2785,7 +2785,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$exists_file2 = realpath(_PS_DOWNLOAD_DIR_).'/'.$product_download_attribute->filename;
|
||||
if (!file_exists($exists_file2) && !empty($product_download_attribute->id_product_attribute))
|
||||
{
|
||||
$msg = sprintf(Tools::displayError('This file "%s" is missing'), $product_download_attribute->display_filename);
|
||||
$msg = sprintf(Tools::displayError('This file \\"%s\\" is missing'), $product_download_attribute->display_filename);
|
||||
$error .= '<p class="alert" id="file_missing">
|
||||
<b>'.$msg.' :<br/>
|
||||
'.realpath(_PS_DOWNLOAD_DIR_).'/'.$product_download_attribute->filename.'</b>
|
||||
@@ -2936,9 +2936,9 @@ class AdminProductsControllerCore extends AdminController
|
||||
|
||||
$content .= '
|
||||
<div class="separation"></div>
|
||||
<h4>'.$this->l('Priorities management').'</h4>
|
||||
<h4>'.$this->l('Priority management').'</h4>
|
||||
<div class="hint" style="display:block;min-height:0;">
|
||||
'.$this->l('Sometimes one customer can fit in multiple specific prices rules. Priorities allow you to define which rule applies to the customer.').'
|
||||
'.$this->l('Sometimes one customer can fit into multiple specific price rules. Priorities allow you to define which rule applies to the customer.').'
|
||||
</div
|
||||
<br /><br />
|
||||
<label>'.$this->l('Priorities:').'</label>
|
||||
@@ -3561,7 +3561,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$this->displayWarning($this->l('If you wish to use the advanced stock management, you have to:'));
|
||||
$this->displayWarning('- '.$this->l('associate your products with warehouses'));
|
||||
$this->displayWarning('- '.$this->l('associate your warehouses with carriers'));
|
||||
$this->displayWarning('- '.$this->l('associate your warehouses with the appropriates shops'));
|
||||
$this->displayWarning('- '.$this->l('associate your warehouses with the appropriate shops'));
|
||||
}
|
||||
|
||||
$pack_quantity = null;
|
||||
@@ -3990,7 +3990,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$content = '<div class="warn">
|
||||
<p>
|
||||
<span style="float: left">
|
||||
'.$this->l('Your product will be saved as draft').'
|
||||
'.$this->l('Your product will be saved as a draft').'
|
||||
</span>
|
||||
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
|
||||
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
|
||||
|
||||
@@ -55,7 +55,7 @@ class AdminProfilesControllerCore extends AdminController
|
||||
|
||||
$this->fields_form = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Profils'),
|
||||
'title' => $this->l('Profile'),
|
||||
'image' => '../img/admin/profiles.png'
|
||||
),
|
||||
'input' => array(
|
||||
@@ -69,7 +69,7 @@ class AdminProfilesControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save '),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -86,7 +86,7 @@ class AdminProfilesControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
|
||||
@@ -76,7 +76,7 @@ class AdminRangePriceControllerCore extends AdminController
|
||||
'id' => 'id_carrier',
|
||||
'name' => 'name'
|
||||
),
|
||||
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for a price range.').'</div>'
|
||||
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for this price range.').'</div>'
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -124,9 +124,9 @@ class AdminRangePriceControllerCore extends AdminController
|
||||
if (Tools::getValue('submitAdd'.$this->table) && Tools::getValue('delimiter1') >= Tools::getValue('delimiter2'))
|
||||
$this->errors[] = Tools::displayError('Invalid range');
|
||||
else if (!$id && RangePrice::rangeExist((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
|
||||
$this->errors[] = Tools::displayError('Range already exist');
|
||||
$this->errors[] = Tools::displayError('Range already exists');
|
||||
else if (!$id && RangePrice::isOverlapping((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
|
||||
$this->errors[] = Tools::displayError('Range is overlapping');
|
||||
$this->errors[] = Tools::displayError('Ranges are overlapping');
|
||||
else
|
||||
parent::postProcess();
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ class AdminRangeWeightControllerCore extends AdminController
|
||||
'id' => 'id_carrier',
|
||||
'name' => 'name'
|
||||
),
|
||||
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for a weight range.').'</div>'
|
||||
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for this weight range.').'</div>'
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -119,9 +119,9 @@ class AdminRangeWeightControllerCore extends AdminController
|
||||
if ($this->action == 'save' && Tools::getValue('delimiter1') >= Tools::getValue('delimiter2'))
|
||||
$this->errors[] = Tools::displayError('Invalid range');
|
||||
else if (!$id && RangeWeight::rangeExist((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
|
||||
$this->errors[] = Tools::displayError('Range already exist');
|
||||
$this->errors[] = Tools::displayError('Range already exists');
|
||||
else if (!$id && RangeWeight::isOverlapping((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
|
||||
$this->errors[] = Tools::displayError('Range is overlapping');
|
||||
$this->errors[] = Tools::displayError('Ranges are overlapping');
|
||||
else
|
||||
parent::postProcess();
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ class AdminReferrersControllerCore extends AdminController
|
||||
'name' => 'request_uri_like',
|
||||
'cols' => 40,
|
||||
'rows' => 1,
|
||||
'h3' => $this->l('Request Uri')
|
||||
'h3' => $this->l('Request URI')
|
||||
),
|
||||
array(
|
||||
'type' => 'textarea',
|
||||
@@ -322,7 +322,7 @@ class AdminReferrersControllerCore extends AdminController
|
||||
'name' => 'request_uri_regexp',
|
||||
'cols' => 40,
|
||||
'rows' => 1,
|
||||
'h3' => $this->l('Request Uri')
|
||||
'h3' => $this->l('Request URI')
|
||||
),
|
||||
array(
|
||||
'type' => 'textarea',
|
||||
|
||||
@@ -49,15 +49,15 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
|
||||
public function renderList()
|
||||
{
|
||||
$this->displayWarning($this->l('When saving the query, only the request type "SELECT" are allowed.'));
|
||||
$this->displayWarning($this->l('When saving the query, only the request type \\"SELECT\\" are allowed.'));
|
||||
$this->displayInformation('
|
||||
<strong>'.$this->l('How to create a new sql query?').'</strong>
|
||||
<br />
|
||||
<ul>
|
||||
<li>'.$this->l('Click "Add new".').'<br /></li>
|
||||
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
|
||||
<li>'.$this->l('You can then view the query results by clicking on the tab: ').' <img src="../img/admin/details.gif"></li>
|
||||
<li>'.$this->l('You can then export the query results as a file. Csv file by clicking on the tab: ').' <img src="../img/admin/export.gif"></li>
|
||||
<li>'.$this->l('Click \\"Add new\\".').'<br /></li>
|
||||
<li>'.$this->l('Fill in the fields and click \\"Save\\".').'</li>
|
||||
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif"></li>
|
||||
<li>'.$this->l('You can then export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif"></li>
|
||||
</ul>
|
||||
');
|
||||
|
||||
@@ -93,7 +93,7 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -290,58 +290,58 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
{
|
||||
case 'checkedFrom':
|
||||
if (isset($e[$key]['table']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The Table ').' "'.$e[$key]['table'].'" '.$this->l(' doesn\'t exist.'));
|
||||
$this->errors[] = Tools::DisplayError($this->l('The Table').' "'.$e[$key]['table'].'" '.$this->l('doesn\'t exist.'));
|
||||
else if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
|
||||
case 'checkedSelect':
|
||||
if (isset($e[$key]['table']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The Table ').' "'.$e[$key]['table'].'" '.$this->l(' doesn\'t exist.'));
|
||||
$this->errors[] = Tools::DisplayError($this->l('The Table').' "'.$e[$key]['table'].'" '.$this->l('doesn\'t exist.'));
|
||||
else if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else if (isset($e[$key]['*']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operand "*" can be used in a nested query.'));
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operator \\"*\\" can be used in a nested query.'));
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
|
||||
case 'checkedWhere':
|
||||
if (isset($e[$key]['operator']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operator ').' "'.$e[$key]['operator'].'" '.$this->l(' used is incorrect.'));
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operator').' "'.$e[$key]['operator'].'" '.$this->l('used is incorrect.'));
|
||||
else if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
|
||||
case 'checkedHaving':
|
||||
if (isset($e[$key]['operator']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operator ').' "'.$e[$key]['operator'].'" '.$this->l(' used is incorrect.'));
|
||||
$this->errors[] = Tools::DisplayError($this->l('The operator').' "'.$e[$key]['operator'].'" '.$this->l('used is incorrect.'));
|
||||
else if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
|
||||
case 'checkedOrder':
|
||||
if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
|
||||
case 'checkedGroupBy':
|
||||
if (isset($e[$key]['attribut']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute ').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l(' does not exist in the table: ').$e[$key]['attribut'][1].'.');
|
||||
$this->errors[] = Tools::DisplayError($this->l('The attribute').' "'.
|
||||
$e[$key]['attribut'][0].'" '.$this->l('does not exist in the table:').$e[$key]['attribut'][1].'.');
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('Error'));
|
||||
break;
|
||||
@@ -352,18 +352,18 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
|
||||
case 'returnNameTable':
|
||||
if (isset($e[$key]['reference']))
|
||||
$this->errors[] = Tools::DisplayError($this->l('The reference ').'"'.
|
||||
$e[$key]['reference'][0].'"'.$this->l(' doesn\'t exist in : ').$e[$key]['reference'][1]);
|
||||
$this->errors[] = Tools::DisplayError($this->l('The reference').'"'.
|
||||
$e[$key]['reference'][0].'"'.$this->l('doesn\'t exist in:').$e[$key]['reference'][1]);
|
||||
else
|
||||
$this->errors[] = Tools::DisplayError($this->l('When multiple tables are used, each attribute must be referenced to a table.'));
|
||||
break;
|
||||
|
||||
case 'testedRequired':
|
||||
$this->errors[] = Tools::DisplayError($e[$key].' '.$this->l(' doesn\'t exist.'));
|
||||
$this->errors[] = Tools::DisplayError($e[$key].' '.$this->l('doesn\'t exist.'));
|
||||
break;
|
||||
|
||||
case 'testedUnauthorized':
|
||||
$this->errors[] = Tools::DisplayError($e[$key].' '.$this->l(' is a unauthorized keyword.'));
|
||||
$this->errors[] = Tools::DisplayError($e[$key].' '.$this->l('is a unauthorized keyword.'));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ class AdminReturnControllerCore extends AdminController
|
||||
'general' => array(
|
||||
'title' => $this->l('Merchandise return (RMA) options'),
|
||||
'fields' => array(
|
||||
'PS_ORDER_RETURN' => array('title' => $this->l('Enable returns:'), 'desc' => $this->l('Select whether or not to activate merchandise return for your shop'), 'cast' => 'intval', 'type' => 'bool'),
|
||||
'PS_ORDER_RETURN' => array('title' => $this->l('Enable returns:'), 'desc' => $this->l('Select whether or not to activate merchandise returns for your shop'), 'cast' => 'intval', 'type' => 'bool'),
|
||||
'PS_ORDER_RETURN_NB_DAYS' => array('title' => $this->l('Time limit of validity:'), 'desc' => $this->l('Number of days the customer can make a return after the delivery date'), 'cast' => 'intval', 'type' => 'text', 'size' => '2'),
|
||||
),
|
||||
'submit' => array()
|
||||
@@ -177,7 +177,7 @@ class AdminReturnControllerCore extends AdminController
|
||||
if (OrderReturn::deleteOrderReturnDetail($id_order_return, $id_order_detail, (int)(Tools::getValue('id_customization', 0))))
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=4token='.$this->token);
|
||||
else
|
||||
$this->errors[] = Tools::displayError('An error occurred while deleting an order return detail.');
|
||||
$this->errors[] = Tools::displayError('An error occurred while deleting details of your order return.');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You need at least one product.');
|
||||
@@ -186,7 +186,7 @@ class AdminReturnControllerCore extends AdminController
|
||||
$this->errors[] = Tools::displayError('The order return is invalid.');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('The order return detail is invalid.');
|
||||
$this->errors[] = Tools::displayError('The order return content is invalid.');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('You do not have permission to delete here.');
|
||||
|
||||
@@ -139,7 +139,7 @@ class AdminScenesControllerCore extends AdminController
|
||||
'image' => '../img/admin/photo.gif',
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
),
|
||||
'input' => array(
|
||||
@@ -148,11 +148,11 @@ class AdminScenesControllerCore extends AdminController
|
||||
'name' => 'description',
|
||||
'label' => $this->l('How to map products in the image:'),
|
||||
'text' => $this->l('When a customer hovers over the image with the mouse, a pop-up appears displaying a brief description of the product.').
|
||||
$this->l('The customer can then click to open the product\'s full product page. ').
|
||||
$this->l('To achieve this, please define the \'mapping zone\' that, when hovered over, will display the pop-up. ').
|
||||
$this->l('The customer can then click to open the product\'s full product page.').
|
||||
$this->l('To achieve this, please define the \'mapping zone\' that, when hovered over, will display the pop-up.').
|
||||
$this->l('Left-click with your mouse to draw the four-sided mapping zone, then release.').
|
||||
$this->l('Then, begin typing the name of the associated product. A list of products appears. ').
|
||||
$this->l('Click the appropriate product, then click OK. Repeat these steps for each mapping zone you wish to create. ').
|
||||
$this->l('Then, begin typing the name of the associated product. A list of products appears.').
|
||||
$this->l('Click the appropriate product, then click OK. Repeat these steps for each mapping zone you wish to create.').
|
||||
$this->l('When you have finished mapping zones, click Save Image Map.')
|
||||
),
|
||||
array(
|
||||
@@ -190,7 +190,7 @@ class AdminScenesControllerCore extends AdminController
|
||||
|
||||
$image_to_map_desc = '';
|
||||
$image_to_map_desc .= $this->l('Format:').' JPG, GIF, PNG. '.$this->l('File size:').' '
|
||||
.(Tools::getMaxUploadSize() / 1024).''.$this->l('KB max.').' '
|
||||
.(Tools::getMaxUploadSize() / 1024).''.$this->l('kB max.').' '
|
||||
.$this->l('If larger than the image size setting, the image will be reduced to ')
|
||||
.' '.$large_scene_image_type['width'].'x'.$large_scene_image_type['height'].'px '
|
||||
.$this->l('(width x height). If smaller than the image-size setting, a white background will be added in order to achieve the correct image size.').'<br />'.
|
||||
@@ -220,7 +220,7 @@ class AdminScenesControllerCore extends AdminController
|
||||
$img_alt_desc = '';
|
||||
$img_alt_desc .= $this->l('If you want to use a thumbnail other than one generated from simply reducing the mapped image, please upload it here.')
|
||||
.'<br />'.$this->l('Format:').' JPG, GIF, PNG. '
|
||||
.$this->l('Filesize:').' '.(Tools::getMaxUploadSize() / 1024).''.$this->l('Kb max.').' '
|
||||
.$this->l('Filesize:').' '.(Tools::getMaxUploadSize() / 1024).''.$this->l('kB max.').' '
|
||||
.$this->l('Automatically resized to')
|
||||
.' '.$thumb_scene_image_type['width'].'x'.$thumb_scene_image_type['height'].'px '.$this->l('(width x height)').'.<br />'
|
||||
.$this->l('Note: To change image dimensions, please change the \'thumb_scene\' image type settings to the desired size (in Back Office > Preferences > Images).');
|
||||
@@ -274,7 +274,7 @@ class AdminScenesControllerCore extends AdminController
|
||||
}
|
||||
else
|
||||
{
|
||||
$image_to_map_desc .= '<br/><span class="bold">'.$this->l('Please add a picture to continue mapping the image...').'</span><br/><br/>';
|
||||
$image_to_map_desc .= '<br/><span class="bold">'.$this->l('Please add a picture to continue mapping the image.').'</span><br/><br/>';
|
||||
$image_to_map_desc .= '</div>';
|
||||
}
|
||||
if (Shop::isFeatureActive())
|
||||
|
||||
@@ -65,16 +65,16 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
'title' => $this->l('Indexation'),
|
||||
'icon' => 'search',
|
||||
'info' =>
|
||||
$this->l('The "indexed" products have been analysed by PrestaShop and will appear in the results of the front office search.').'<br />
|
||||
$this->l('The \\"indexed\\" products have been analyzed by PrestaShop and will appear in the results of the Front Office search.').'<br />
|
||||
'.$this->l('Indexed products:').' <b>'.(int)$indexed.' / '.(int)$total.'</b>.
|
||||
</p>
|
||||
<p>'.$this->l('Building the product index can take a few minutes or more.')
|
||||
.$this->l('If your server stop the process before it ends, you can resume the indexation by clicking "Add missing products".').'</p>
|
||||
.$this->l('If your server stops the process before it ends, you can resume the indexation by clicking \\"Add missing products.\\"').'</p>
|
||||
-> <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
|
||||
$this->l('Add missing products to index.').'</a><br />
|
||||
-> <a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
|
||||
$this->l('Re-build entire index.').'</a><br /><br />
|
||||
'.$this->l('You can set a cron job that will re-build your index using the following URL:').' <a href="'.$cron_url.'">'.$cron_url.'</a>'
|
||||
'.$this->l('You can set a cron job that will rebuild your index using the following URL:').' <a href="'.$cron_url.'">'.$cron_url.'</a>'
|
||||
),
|
||||
'search' => array(
|
||||
'title' => $this->l('Search'),
|
||||
@@ -85,18 +85,18 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
'validation' => 'isBool',
|
||||
'type' => 'bool',
|
||||
'cast' => 'intval',
|
||||
'desc' => $this->l('Enable the ajax search for your visitors.').'<br />'.
|
||||
$this->l('With the ajax search, the first 10 products matching the user query will appear in real time below the input field.')),
|
||||
'desc' => $this->l('Enable ajax search for your visitors.').'<br />'.
|
||||
$this->l('With ajax search, the first 10 products matching the user query will appear in real time below the input field.')),
|
||||
'PS_INSTANT_SEARCH' => array(
|
||||
'title' => $this->l('Instant search:'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool',
|
||||
'desc' => $this->l('Enable the instant search for your visitors.').'<br />'.
|
||||
$this->l('With the instant search, the results will appear immediatly while the user write his query.')),
|
||||
'desc' => $this->l('Enable instant search for your visitors.').'<br />'.
|
||||
$this->l('With instant search, the results will appear immediately as the user writes a query.')),
|
||||
'PS_SEARCH_MINWORDLEN' => array(
|
||||
'title' => $this->l('Minimum word length'),
|
||||
'desc' => $this->l('Only words from this size will be indexed.'),
|
||||
'title' => $this->l('Minimum word length (in characters)'),
|
||||
'desc' => $this->l('Only words this size or larger will be indexed.'),
|
||||
'size' => 4,
|
||||
'validation' => 'isUnsignedInt',
|
||||
'type' => 'text',
|
||||
@@ -116,9 +116,9 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
'title' => $this->l('Weight'),
|
||||
'icon' => 'weight',
|
||||
'info' =>
|
||||
$this->l('The "weight" represents its importance and relevance for the ranking of the products when try a new search.').'<br />
|
||||
$this->l('The \\"weight\\" represents its importance and relevance for the ranking of the products when try a new search.').'<br />
|
||||
'.$this->l('A word with a weight of 8 will have 4 times more value than a word with a weight of 2.').'<br /><br />
|
||||
'.$this->l('That\'s why we advise to set a greater weight for words which appear in the name or reference of a products than the ones of the description. Thus, the search results will be as precised and releant as possible.'),
|
||||
'.$this->l('That\'s why we advise to set a greater weight for words which appear in the name or reference of a product than the ones in the description. Thus, the search results will be as precise and relevant as possible.'),
|
||||
'fields' => array(
|
||||
'PS_SEARCH_WEIGHT_PNAME' => array(
|
||||
'title' => $this->l('Product name weight'),
|
||||
@@ -233,7 +233,7 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
'size' => 40,
|
||||
'required' => true,
|
||||
'desc' => array(
|
||||
$this->l('Enter each alias separated by a comma (\',\') (e.g., \'prestshop,preztashop,prestasohp\')'),
|
||||
$this->l('Enter each alias separated by a comma (\',\') (e.g. \'prestshop,preztashop,prestasohp\')'),
|
||||
$this->l('Forbidden characters: <>;=#{}')
|
||||
)
|
||||
),
|
||||
@@ -247,7 +247,7 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -280,6 +280,6 @@ class AdminSearchConfControllerCore extends AdminController
|
||||
}
|
||||
|
||||
if (empty($this->errors))
|
||||
$this->confirmations[] = $this->l('Creation successfull');
|
||||
$this->confirmations[] = $this->l('Creation successful');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ class AdminSearchControllerCore extends AdminController
|
||||
{
|
||||
if (!ip2long(trim($this->query)))
|
||||
{
|
||||
$this->errors[] = Tools::displayError('It seems that this is not an IP address :').' '.Tools::htmlentitiesUTF8($this->query);
|
||||
$this->errors[] = Tools::displayError('It seems that this is not an IP address:').' '.Tools::htmlentitiesUTF8($this->query);
|
||||
return;
|
||||
}
|
||||
$this->_list['customers'] = Customer::searchByIp($this->query);
|
||||
@@ -196,7 +196,7 @@ class AdminSearchControllerCore extends AdminController
|
||||
'lastname' => array('title' => $this->l('Name'), 'align' => 'left', 'width' => 'auto'),
|
||||
'email' => array('title' => $this->l('E-mail address'), 'align' => 'left', 'width' => 250),
|
||||
'birthday' => array('title' => $this->l('Birth date'), 'align' => 'center', 'type' => 'date', 'width' => 75),
|
||||
'date_add' => array('title' => $this->l('Register date'), 'align' => 'center', 'type' => 'date', 'width' => 75),
|
||||
'date_add' => array('title' => $this->l('Registration date'), 'align' => 'center', 'type' => 'date', 'width' => 75),
|
||||
'orders' => array('title' => $this->l('Orders'), 'align' => 'center', 'width' => 50),
|
||||
'active' => array('title' => $this->l('Enabled'),'align' => 'center','active' => 'status','type' => 'bool', 'width' => 25),
|
||||
));
|
||||
@@ -210,8 +210,8 @@ class AdminSearchControllerCore extends AdminController
|
||||
'manufacturer_name' => array('title' => $this->l('Manufacturer'), 'align' => 'center', 'width' => 200),
|
||||
'reference' => array('title' => $this->l('Reference'), 'align' => 'center', 'width' => 150),
|
||||
'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
|
||||
'price_tax_excl' => array('title' => $this->l('Price tax excl'), 'align' => 'right', 'type' => 'price', 'width' => 60),
|
||||
'price_tax_incl' => array('title' => $this->l('Price tax incl'), 'align' => 'right', 'type' => 'price', 'width' => 60),
|
||||
'price_tax_excl' => array('title' => $this->l('Price (tax excl.)'), 'align' => 'right', 'type' => 'price', 'width' => 60),
|
||||
'price_tax_incl' => array('title' => $this->l('Price (tax incl.)'), 'align' => 'right', 'type' => 'price', 'width' => 60),
|
||||
'status' => array('title' => $this->l('Status'), 'align' => 'center', 'width' => 25),
|
||||
));
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ class AdminSearchEnginesControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save '),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
|
||||
@@ -122,7 +122,7 @@ class AdminShopControllerCore extends AdminController
|
||||
|
||||
$this->toolbar_btn['new-url'] = array(
|
||||
'href' => $this->context->link->getAdminLink('AdminShopUrl').'&id_shop='.$shop->id.'&addshop_url',
|
||||
'desc' => $this->l('Add url'),
|
||||
'desc' => $this->l('Add URL'),
|
||||
'class' => 'addShopUrl'
|
||||
);
|
||||
|
||||
@@ -327,7 +327,7 @@ class AdminShopControllerCore extends AdminController
|
||||
$this->fields_form['input'][] = array(
|
||||
'type' => 'categories_select',
|
||||
'name' => 'categoryBox',
|
||||
'label' => $this->l('Associated categories :'),
|
||||
'label' => $this->l('Associated categories:'),
|
||||
'category_tree' => $this->initCategoriesAssociation($parent)
|
||||
);
|
||||
$this->fields_form['input'][] = array(
|
||||
@@ -369,7 +369,7 @@ class AdminShopControllerCore extends AdminController
|
||||
);
|
||||
|
||||
$this->fields_form['submit'] = array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
);
|
||||
|
||||
@@ -391,8 +391,8 @@ class AdminShopControllerCore extends AdminController
|
||||
'lang' => $this->l('Langs'),
|
||||
'manufacturer' => $this->l('Manufacturers'),
|
||||
'module' => $this->l('Modules'),
|
||||
'hook_module' => $this->l('Modules hook'),
|
||||
'hook_module_exceptions' => $this->l('Modules hook exceptions'),
|
||||
'hook_module' => $this->l('Module hooks'),
|
||||
'hook_module_exceptions' => $this->l('Module hook exceptions'),
|
||||
'meta_lang' => $this->l('Meta'),
|
||||
'module_country' => $this->l('Payment module country restrictions'),
|
||||
'module_group' => $this->l('Payment module customer group restrictions'),
|
||||
@@ -427,7 +427,7 @@ class AdminShopControllerCore extends AdminController
|
||||
'label' => $this->l('Choose data to import'),
|
||||
'values' => $import_data
|
||||
),
|
||||
'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
|
||||
'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way for the selected shop')
|
||||
);
|
||||
|
||||
$this->fields_value = array(
|
||||
|
||||
@@ -62,7 +62,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
'filter_key' => 'domain'
|
||||
),
|
||||
'uri' => array(
|
||||
'title' => $this->l('Uri'),
|
||||
'title' => $this->l('URI'),
|
||||
'width' => 200,
|
||||
'filter_key' => 'uri',
|
||||
'havingFilter' => true
|
||||
@@ -108,7 +108,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
{
|
||||
$this->fields_form = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Shop Url')
|
||||
'title' => $this->l('Shop URL')
|
||||
),
|
||||
'input' => array(
|
||||
array(
|
||||
@@ -127,7 +127,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Physical URI:'),
|
||||
'name' => 'physical_uri',
|
||||
'desc' => $this->l('Physical folder of your store on your server. Leave this field empty if your store is installed on root path. E.g. if your store is available from www.my-prestashop.com/my-store/, you have to set my-store/ in this field.'),
|
||||
'desc' => $this->l('Physical folder of your store on your server. Leave this field empty if your store is installed on the root path (e.g. if your store is available at www.my-prestashop.com/my-store/, you would set my-store/ in this field).'),
|
||||
'size' => 50,
|
||||
),
|
||||
array(
|
||||
@@ -135,7 +135,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
'label' => $this->l('Virtual URI:'),
|
||||
'name' => 'virtual_uri',
|
||||
'desc' => array(
|
||||
$this->l('You can use this option if you want to create a store with an URI that doesn\'t exist on your server. E.g. if you want your store to be available with url www.my-prestashop.com/my-store/shoes/, you have to set shoes/ in this field (we considere that my-store/ is your physical URI).'),
|
||||
$this->l('You can use this option if you want to create a store with an URI that doesn\'t exist on your server (e.g. if you want your store to be available with the URL www.my-prestashop.com/my-store/shoes/, you have to set shoes/ in this field, assuming that my-store/ is your Physical URI).'),
|
||||
'<strong>'.$this->l('URL rewriting must be activated on your server to use this feature.').'</strong>'
|
||||
),
|
||||
'size' => 50,
|
||||
@@ -182,13 +182,13 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'desc' => array(
|
||||
$this->l('If you set this url as main url for selected shop, all urls set to this shop will be redirected to this url (you can only have one main url per shop).'),
|
||||
$this->l('If you set this URL as the Main URL for the selected shop, all URLs set to this shop will be redirected to this URL (you can only have one Main URL per shop).'),
|
||||
array(
|
||||
'text' => $this->l('Since the selected shop has no main url, you have to set this url as main'),
|
||||
'text' => $this->l('Since the selected shop has no Main URL, you have to set this URL as the Main URL'),
|
||||
'id' => 'mainUrlInfo'
|
||||
),
|
||||
array(
|
||||
'text' => $this->l('The selected shop has already a main url, if you set this one as main url, the older one will be set as normal url'),
|
||||
'text' => $this->l('The selected shop has already a Main URL, if you set this one as the Main URL, the older one will be set as the Normal URL.'),
|
||||
'id' => 'mainUrlInfoExplain'
|
||||
)
|
||||
)
|
||||
@@ -215,7 +215,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -253,7 +253,7 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
if (Validate::isLoadedObject($object = $this->loadObject()))
|
||||
{
|
||||
if ($object->main)
|
||||
$this->errors[] = Tools::displayError('You can\'t disable a main url');
|
||||
$this->errors[] = Tools::displayError('You can\'t disable a Main URL');
|
||||
elseif ($object->toggleStatus())
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.$token);
|
||||
else
|
||||
@@ -292,13 +292,13 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
$object->setMain();
|
||||
|
||||
if ($object->main && !Tools::getValue('main'))
|
||||
$this->errors[] = Tools::displayError('You can\'t change a main url to a non main url, you have to set an other url as main url for selected shop');
|
||||
$this->errors[] = Tools::displayError('You can\'t change a Main URL to a non-Main URL, you have to set another URL as Main URL for selected shop');
|
||||
|
||||
if (($object->main || Tools::getValue('main')) && !Tools::getValue('active'))
|
||||
$this->errors[] = Tools::displayError('You can\'t disable a main url');
|
||||
$this->errors[] = Tools::displayError('You can\'t disable a Main URL');
|
||||
|
||||
if ($object->canAddThisUrl(Tools::getValue('domain'), Tools::getValue('domain_ssl'), Tools::getValue('physical_uri'), Tools::getValue('virtual_uri')))
|
||||
$this->errors[] = Tools::displayError('A shop url that use this domain and uri already exists');
|
||||
$this->errors[] = Tools::displayError('A shop URL that use this domain and uri already exists');
|
||||
|
||||
parent::processAdd($token);
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ class AdminSlipControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2007-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
|
||||
),
|
||||
array(
|
||||
'type' => 'date',
|
||||
@@ -88,7 +88,7 @@ class AdminSlipControllerCore extends AdminController
|
||||
'size' => 20,
|
||||
'maxlength' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Format: 2008-12-31 (inclusive)')
|
||||
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
@@ -112,9 +112,9 @@ class AdminSlipControllerCore extends AdminController
|
||||
if (Tools::getValue('submitAddorder_slip'))
|
||||
{
|
||||
if (!Validate::isDate(Tools::getValue('date_from')))
|
||||
$this->errors[] = $this->l('Invalid from date');
|
||||
$this->errors[] = $this->l('Invalid \\"From\\" date');
|
||||
if (!Validate::isDate(Tools::getValue('date_to')))
|
||||
$this->errors[] = $this->l('Invalid end date');
|
||||
$this->errors[] = $this->l('Invalid \\"To\\" date');
|
||||
if (!count($this->errors))
|
||||
{
|
||||
$order_slips = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
|
||||
|
||||
@@ -229,7 +229,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
),
|
||||
);
|
||||
|
||||
@@ -183,7 +183,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
|
||||
if (Tools::isSubmit('submitDatePicker'))
|
||||
{
|
||||
if (!Validate::isDate($from = Tools::getValue('datepickerFrom')) || !Validate::isDate($to = Tools::getValue('datepickerTo')))
|
||||
$this->errors[] = Tools::displayError('Date specified is invalid');
|
||||
$this->errors[] = Tools::displayError('Specified date is invalid');
|
||||
}
|
||||
if (Tools::isSubmit('submitDateDay'))
|
||||
{
|
||||
|
||||
@@ -194,7 +194,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
'size' => 40,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
|
||||
'desc' => $this->l('Order status (e.g., \'Pending\')')
|
||||
'desc' => $this->l('Order status (e.g. \'Pending\')')
|
||||
),
|
||||
array(
|
||||
'type' => 'file',
|
||||
@@ -207,7 +207,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
'label' => $this->l('Color:'),
|
||||
'name' => 'color',
|
||||
'size' => 30,
|
||||
'desc' => $this->l('Status will be highlighted in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
|
||||
'desc' => $this->l('Status will be highlighted in this color. HTML colors only (e.g.').' "lightblue", "#CC6600")'
|
||||
),
|
||||
array(
|
||||
'type' => 'checkbox',
|
||||
@@ -261,7 +261,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
'query' => array(
|
||||
array(
|
||||
'id' => 'on',
|
||||
'name' => $this->l('Send e-mail to customer when order is changed to this status'),
|
||||
'name' => $this->l('Send e-mail to customer when order status is changed'),
|
||||
'val' => '1'
|
||||
),
|
||||
),
|
||||
@@ -314,7 +314,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -360,7 +360,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -496,7 +496,7 @@ class AdminStatusesControllerCore extends AdminController
|
||||
|
||||
// Update object
|
||||
if (!$order_return_state->save())
|
||||
$this->errors[] = Tools::displayError('An error has occured: Can\'t save the current order return state');
|
||||
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current order return state');
|
||||
else
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
|
||||
}
|
||||
|
||||
@@ -56,8 +56,8 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'type' => 'select',
|
||||
'filter_key' => 'a!sign',
|
||||
'list' => array(
|
||||
'1' => $this->l('Increment'),
|
||||
'-1' => $this->l('Decrement'),
|
||||
'1' => $this->l('Increase'),
|
||||
'-1' => $this->l('Decrease'),
|
||||
),
|
||||
'icon' => array(
|
||||
-1 => 'remove_stock.png',
|
||||
@@ -85,7 +85,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'title' => $this->l('Options'),
|
||||
'fields' => array(
|
||||
'PS_STOCK_MVT_INC_REASON_DEFAULT' => array(
|
||||
'title' => $this->l('Default label when incrementing stock:'),
|
||||
'title' => $this->l('Default label when increasing stock:'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'list' => $reasons_inc,
|
||||
@@ -93,7 +93,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_STOCK_MVT_DEC_REASON_DEFAULT' => array(
|
||||
'title' => $this->l('Default label when decrementing stock:'),
|
||||
'title' => $this->l('Default label when decreasing stock:'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'list' => $reasons_dec,
|
||||
@@ -101,7 +101,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_STOCK_CUSTOMER_ORDER_REASON' => array(
|
||||
'title' => $this->l('Default label when decrementing stock when a customer order is shipped:'),
|
||||
'title' => $this->l('Default label when decreasing stock when a customer order is shipped:'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'list' => $reasons_dec,
|
||||
@@ -109,7 +109,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'visibility' => Shop::CONTEXT_ALL
|
||||
),
|
||||
'PS_STOCK_MVT_SUPPLY_ORDER' => array(
|
||||
'title' => $this->l('Default label when incrementing stock when a supply order is received:'),
|
||||
'title' => $this->l('Default label when increasing stock when a supply order is received:'),
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
'list' => $reasons_inc,
|
||||
@@ -152,7 +152,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
Tools::isSubmit('submitAddstock_mvt_reason') ||
|
||||
Tools::isSubmit('submitUpdatestock_mvt_reason'))
|
||||
{
|
||||
$this->toolbar_title = $this->l('Stock : Add stock movement label');
|
||||
$this->toolbar_title = $this->l('Stock: Add stock movement label');
|
||||
|
||||
$this->fields_form = array(
|
||||
'legend' => array(
|
||||
@@ -187,11 +187,11 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'id' => 'id',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Select the corresponding action : increments or decrements stock.')
|
||||
'desc' => $this->l('Select the corresponding action: increase or decrease stock.')
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -221,7 +221,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'label' => $this->l('Color:'),
|
||||
'name' => 'color',
|
||||
'size' => 20,
|
||||
'desc' => $this->l('Back office background will be displayed in this color. HTML colors only.'),
|
||||
'desc' => $this->l('Back Office background will be displayed in this color. HTML colors only.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -242,7 +242,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('For this status, you have to define if it is possible to edit the order. An editable order is an order not valid to send to the supplier.')
|
||||
'desc' => $this->l('Define if it is possible to edit the order. An editable order is not valid to send to the supplier.')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -263,7 +263,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('For this status, you have to define if it is possible to generate the delivery note of the order.')
|
||||
'desc' => $this->l('Define if it is possible to generate a delivery note of the order.')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -284,7 +284,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('For this status, you have to define if products have been partially/completely received. This allows to know if the products ordered have to be added to the corresponding warehouse.'),
|
||||
'desc' => $this->l('Define if products have been partially/completely received. This allows you to know if the products ordered have to be added to the corresponding warehouse.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -305,20 +305,20 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
'label' => $this->l('No')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Does this status mean that you are waiting for the delivery ?')
|
||||
'desc' => $this->l('Customer is awaiting delivery')
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
|
||||
if (Tools::isSubmit('addsupply_order_state'))
|
||||
$this->toolbar_title = $this->l('Stock : Add supply order status');
|
||||
$this->toolbar_title = $this->l('Stock: Add supply order status');
|
||||
else
|
||||
{
|
||||
$this->toolbar_title = $this->l('Stock : Update Supply order status');
|
||||
$this->toolbar_title = $this->l('Stock: Update Supply order status');
|
||||
|
||||
$id_supply_order_state = Tools::getValue('id_supply_order_state', 0);
|
||||
|
||||
@@ -341,14 +341,14 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'color',
|
||||
'label' => $this->l('Back office color:'),
|
||||
'label' => $this->l('Back Office color:'),
|
||||
'name' => 'color',
|
||||
'size' => 20,
|
||||
'desc' => $this->l('Back office background will be displayed in this color. HTML colors only'),
|
||||
'desc' => $this->l('Back Office background will be displayed in this color. HTML colors only'),
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -381,7 +381,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
/**
|
||||
* General messages displayed for all lists
|
||||
*/
|
||||
$this->displayInformation($this->l('This interface allows you to configure your supply orders status and stock movements labels.').'<br />');
|
||||
$this->displayInformation($this->l('This interface allows you to configure your supply order statuses and stock movement labels.').'<br />');
|
||||
|
||||
// Checks access
|
||||
if (!($this->tabAccess['add'] === '1'))
|
||||
@@ -399,7 +399,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
$this->addRowActionSkipList('delete', array(1, 2, 3, 4, 5, 6, 7, 8));
|
||||
$this->_where = ' AND a.deleted = 0';
|
||||
|
||||
$this->toolbar_title = $this->l('Stock : Stock movements labels');
|
||||
$this->toolbar_title = $this->l('Stock: Stock movement labels');
|
||||
$first_list = parent::renderList();
|
||||
|
||||
/**
|
||||
@@ -434,7 +434,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
$this->list_no_link = true;
|
||||
$this->_orderBy = null;
|
||||
$this->addRowActionSkipList('delete', array(1, 2, 3, 4, 5, 6));
|
||||
$this->toolbar_title = $this->l('Stock : Supply Order status');
|
||||
$this->toolbar_title = $this->l('Stock: Supply Order status');
|
||||
$this->initToolbar();
|
||||
|
||||
$this->fieldsDisplay = array(
|
||||
@@ -548,7 +548,7 @@ class AdminStockConfigurationControllerCore extends AdminController
|
||||
$item = &$this->_list[$i];
|
||||
|
||||
if (empty($item['product_name']))
|
||||
$item['product_name'] = $this->l('The name of this product is not available. Maybe it has been deleted from the system.');
|
||||
$item['product_name'] = $this->l('The name of this product is not available. It may been deleted from the system.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ class AdminStockInstantStateControllerCore extends AdminController
|
||||
'havingFilter' => true
|
||||
),
|
||||
'price_te' => array(
|
||||
'title' => $this->l('Price (te)'),
|
||||
'title' => $this->l('Price (tax excl.)'),
|
||||
'width' => 150,
|
||||
'orderby' => true,
|
||||
'search' => false,
|
||||
@@ -75,7 +75,7 @@ class AdminStockInstantStateControllerCore extends AdminController
|
||||
'search' => false,
|
||||
'type' => 'price',
|
||||
'currency' => true,
|
||||
'hint' => $this->l('Valuation of the physical quantity. The sum (for all prices) is not available for all warehouses, please filter by warehouse.')
|
||||
'hint' => $this->l('Total value of the physical quantity. The sum (for all prices) is not available for all warehouses, please filter by warehouse.')
|
||||
),
|
||||
'physical_quantity' => array(
|
||||
'title' => $this->l('Physical quantity'),
|
||||
@@ -152,7 +152,7 @@ class AdminStockInstantStateControllerCore extends AdminController
|
||||
$this->ajax_params = array('id_warehouse' => $this->getCurrentCoverageWarehouse());
|
||||
|
||||
// displays help information
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed informations on your stock, per warehouse.'));
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed information on your stock per warehouse.'));
|
||||
|
||||
// sets toolbar
|
||||
$this->initToolbar();
|
||||
|
||||
@@ -76,7 +76,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
$this->_conf = array(
|
||||
1 => $this->l('The product was successfully added to stock'),
|
||||
2 => $this->l('The product was successfully removed from the stock'),
|
||||
3 => $this->l('The transfer was successfully done'),
|
||||
3 => $this->l('The transfer was successfully completed'),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -107,10 +107,10 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
// displays informations
|
||||
$this->displayInformation($this->l('This interface allows you to manage the stocks of each of your products and their variations.').'<br />');
|
||||
$this->displayInformation($this->l('Through this interface, you can increase quantities (add) and decrease quantities (delete) of products for a given warehouse.'));
|
||||
$this->displayInformation($this->l('Furthermore, you can move quantities (transfer) of products between warehouses, or within one warehouse.').'<br />');
|
||||
$this->displayInformation($this->l('Furthermore, you can move quantities of (transfer) products between warehouses, or within one warehouse.').'<br />');
|
||||
$this->displayInformation($this->l('Note that if you want to increase quantities of multiple products at once, you can use the supply orders tab.').'<br />');
|
||||
$this->displayInformation($this->l('Finally, you will be asked to specify the state of the quantity you will add : '));
|
||||
$this->displayInformation($this->l('usable for sale means that this quantity will be available in shop(s),'));
|
||||
$this->displayInformation($this->l('Finally, you will be asked to specify the state of the quantity you will add:'));
|
||||
$this->displayInformation($this->l('usable for sale means that this quantity will be available in your shop(s),'));
|
||||
$this->displayInformation($this->l('otherwise it will be considered reserved (i.e. for other purposes).'));
|
||||
|
||||
return parent::renderList();
|
||||
@@ -205,7 +205,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Name :'),
|
||||
'label' => $this->l('Name:'),
|
||||
'name' => 'name',
|
||||
'size' => 75,
|
||||
'disabled' => true,
|
||||
@@ -225,7 +225,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Usable for sale?:'),
|
||||
'label' => $this->l('Usable for sale?'),
|
||||
'name' => 'usable',
|
||||
'required' => true,
|
||||
'class' => 't',
|
||||
@@ -258,13 +258,13 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Unit price (TE):'),
|
||||
'label' => $this->l('Unit price (tax excl.):'),
|
||||
'name' => 'price',
|
||||
'required' => true,
|
||||
'size' => 10,
|
||||
'maxlength' => 10,
|
||||
'desc' => $this->l('Unit purchase price or unit manufacturing cost for this product, tax excluded'),
|
||||
'hint' => sprintf($this->l('Last unit price (te) : %s'), $last_sm_unit_price_te),
|
||||
'desc' => $this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.)'),
|
||||
'hint' => sprintf($this->l('Last unit price (tax excl.): %s'), $last_sm_unit_price_te),
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -280,7 +280,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Label :'),
|
||||
'label' => $this->l('Label:'),
|
||||
'name' => 'id_stock_mvt_reason',
|
||||
'required' => true,
|
||||
'options' => array(
|
||||
@@ -294,7 +294,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Add to stock '),
|
||||
'title' => $this->l('Add to stock'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -340,7 +340,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Name :'),
|
||||
'label' => $this->l('Name:'),
|
||||
'name' => 'name',
|
||||
'size' => 75,
|
||||
'disabled' => true,
|
||||
@@ -373,7 +373,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Do you want to remove this quantity from the usable quantity(yes) or the physical quantity(no)?')
|
||||
'desc' => $this->l('Do you want to remove this quantity from the usable quantity (yes) or the physical quantity (no)?')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -389,7 +389,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Label :'),
|
||||
'label' => $this->l('Label:'),
|
||||
'name' => 'id_stock_mvt_reason',
|
||||
'required' => true,
|
||||
'options' => array(
|
||||
@@ -403,7 +403,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Remove from stock '),
|
||||
'title' => $this->l('Remove from stock'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -412,7 +412,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
case 'transferstock' :
|
||||
$this->fields_form[]['form'] = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Transfert product from warehouse to another'),
|
||||
'title' => $this->l('Transfer product from one warehouse to another'),
|
||||
'image' => '../img/admin/transfer_stock.png'
|
||||
),
|
||||
'input' => array(
|
||||
@@ -448,7 +448,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Name :'),
|
||||
'label' => $this->l('Name:'),
|
||||
'name' => 'name',
|
||||
'size' => 75,
|
||||
'disabled' => true,
|
||||
@@ -460,7 +460,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
'size' => 10,
|
||||
'maxlength' => 6,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Physical quantity to transfer.')
|
||||
'desc' => $this->l('Quantity to transfer:')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -472,11 +472,11 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
'id' => 'id_warehouse',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Select the warehouse want to transfer the product from.')
|
||||
'desc' => $this->l('Select the warehouse from which you want to transfer the product.')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Usable for sale in source warehouse ?'),
|
||||
'label' => $this->l('Usable for sale in source warehouse?'),
|
||||
'name' => 'usable_from',
|
||||
'required' => true,
|
||||
'class' => 't',
|
||||
@@ -505,11 +505,11 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
'id' => 'id_warehouse',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Select the warehouse to transfer the product to.')
|
||||
'desc' => $this->l('Select the warehouse to which to transfer the product.')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
'label' => $this->l('Usable for sale in destination warehouse ?'),
|
||||
'label' => $this->l('Usable for sale in destination warehouse?'),
|
||||
'name' => 'usable_to',
|
||||
'required' => true,
|
||||
'class' => 't',
|
||||
@@ -530,7 +530,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Transfer '),
|
||||
'title' => $this->l('Transfer'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -651,7 +651,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
Tools::redirectAdmin($redirect.'&conf=1');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('An error occured. No stock was added.');
|
||||
$this->errors[] = Tools::displayError('An error occurred. No stock was added.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -672,7 +672,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
Tools::redirectAdmin($redirect.'&conf=2');
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError('It is not possible to remove the specified quantity or an error occured. No stock was removed.');
|
||||
$this->errors[] = Tools::displayError('It is not possible to remove the specified quantity or an error occurred. No stock was removed.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -719,7 +719,7 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
if ($is_transfer)
|
||||
Tools::redirectAdmin($redirect.'&conf=3');
|
||||
else
|
||||
$this->errors[] = Tools::displayError('It is not possible to transfer the specified quantity, or an error occured. No stock was transfered.');
|
||||
$this->errors[] = Tools::displayError('It is not possible to transfer the specified quantity, or an error occurred. No stock was transferred.');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -773,19 +773,19 @@ class AdminStockManagementControllerCore extends AdminController
|
||||
if (Tools::isSubmit('addstock'))
|
||||
{
|
||||
$this->display = 'addstock';
|
||||
$this->toolbar_title = $this->l('Stock : Add product');
|
||||
$this->toolbar_title = $this->l('Stock: Add product');
|
||||
}
|
||||
|
||||
if (Tools::isSubmit('removestock'))
|
||||
{
|
||||
$this->display = 'removestock';
|
||||
$this->toolbar_title = $this->l('Stock : Remove product');
|
||||
$this->toolbar_title = $this->l('Stock: Remove product');
|
||||
}
|
||||
|
||||
if (Tools::isSubmit('transferstock'))
|
||||
{
|
||||
$this->display = 'transferstock';
|
||||
$this->toolbar_title = $this->l('Stock : Transfer product');
|
||||
$this->toolbar_title = $this->l('Stock: Transfer product');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class AdminStockMvtControllerCore extends AdminController
|
||||
$this->multishop_context = Shop::CONTEXT_ALL;
|
||||
|
||||
$this->list_no_link = true;
|
||||
$this->displayInformation($this->l('This interface allows you to display the stock movements for a selected warehouse.').'<br />');
|
||||
$this->displayInformation($this->l('This interface allows you to display the stock movement for a selected warehouse.').'<br />');
|
||||
|
||||
$this->fieldsDisplay = array(
|
||||
'product_reference' => array(
|
||||
@@ -75,8 +75,8 @@ class AdminStockMvtControllerCore extends AdminController
|
||||
'type' => 'select',
|
||||
'filter_key' => 'a!sign',
|
||||
'list' => array(
|
||||
'1' => $this->l('Increment'),
|
||||
'-1' => $this->l('Decrement'),
|
||||
'1' => $this->l('Increase'),
|
||||
'-1' => $this->l('Decrease'),
|
||||
),
|
||||
'icon' => array(
|
||||
-1 => 'remove_stock.png',
|
||||
@@ -89,7 +89,7 @@ class AdminStockMvtControllerCore extends AdminController
|
||||
'filter_key' => 'a!physical_quantity'
|
||||
),
|
||||
'price_te' => array(
|
||||
'title' => $this->l('Price (TE)'),
|
||||
'title' => $this->l('Price (tax excl.)'),
|
||||
'width' => 70,
|
||||
'align' => 'right',
|
||||
'type' => 'price',
|
||||
@@ -235,7 +235,7 @@ class AdminStockMvtControllerCore extends AdminController
|
||||
$item = &$this->_list[$i];
|
||||
|
||||
if (empty($item['product_name']))
|
||||
$item['product_name'] = $this->l('The name of this product is not available. Maybe it has been deleted from the system.');
|
||||
$item['product_name'] = $this->l('The name of this product is not available. It may have been deleted from the system.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
'size' => 33,
|
||||
'required' => false,
|
||||
'hint' => $this->l('Allowed characters: letters, spaces and').' (-)',
|
||||
'desc' => $this->l('Store name, e.g. Citycentre Mall Store')
|
||||
'desc' => $this->l('Store name (e.g. Citycentre Mall Store)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -164,7 +164,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Postcode/ Zip Code:'),
|
||||
'label' => $this->l('Postcode / Zip Code:'),
|
||||
'name' => 'postcode',
|
||||
'size' => 6,
|
||||
'required' => true
|
||||
@@ -207,7 +207,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
'required' => true,
|
||||
'size' => 11,
|
||||
'maxlength' => 12,
|
||||
'desc' => $this->l('Store coords, eg. 45.265469 / -47.226478')
|
||||
'desc' => $this->l('Store coordinates (e.g. 45.265469 / -47.226478)')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -253,7 +253,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
'label' => $this->l('Disabled')
|
||||
)
|
||||
),
|
||||
'desc' => $this->l('Display or not this store')
|
||||
'desc' => $this->l('Whether or not to display this store')
|
||||
)
|
||||
),
|
||||
'rightCols' => array (
|
||||
@@ -261,7 +261,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
'type' => 'file',
|
||||
'label' => $this->l('Picture:'),
|
||||
'name' => 'image',
|
||||
'desc' => $this->l('Store window picture')
|
||||
'desc' => $this->l('Storefront picture')
|
||||
)
|
||||
),
|
||||
'submit' => array(
|
||||
@@ -340,7 +340,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
$zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp);
|
||||
$zip_regexp = str_replace('C', $country->iso_code, $zip_regexp);
|
||||
if (!preg_match($zip_regexp, $postcode))
|
||||
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.').'<br />'.Tools::displayError('Must be typed as follows:').' '.
|
||||
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.').'<br />'.Tools::displayError('Must be typed as follows:').' '.
|
||||
str_replace(
|
||||
'C',
|
||||
$country->iso_code,
|
||||
@@ -356,9 +356,9 @@ class AdminStoresControllerCore extends AdminController
|
||||
);
|
||||
}
|
||||
else if ($zip_code_format)
|
||||
$this->errors[] = Tools::displayError('Postcode required.');
|
||||
$this->errors[] = Tools::displayError('Postcode / Zip code required.');
|
||||
else if ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode))
|
||||
$this->errors[] = Tools::displayError('Your zip/postal code is incorrect.');
|
||||
$this->errors[] = Tools::displayError('Your Postcode / Zip code code is incorrect.');
|
||||
}
|
||||
|
||||
/* Store hours */
|
||||
@@ -421,7 +421,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
),
|
||||
'PS_SHOP_DETAILS' => array(
|
||||
'title' => $this->l('Registration:'),
|
||||
'desc' => $this->l('Shop registration information (e.g., SIRET or RCS)'),
|
||||
'desc' => $this->l('Shop registration information (e.g. SIRET or RCS)'),
|
||||
'validation' => 'isGenericName',
|
||||
'size' => 30,
|
||||
'type' => 'textarea',
|
||||
@@ -441,7 +441,7 @@ class AdminStoresControllerCore extends AdminController
|
||||
'type' => 'text'
|
||||
),
|
||||
'PS_SHOP_CODE' => array(
|
||||
'title' => $this->l('Post/Zip code:'),
|
||||
'title' => $this->l('Postcode / Zip code:'),
|
||||
'validation' => 'isGenericName',
|
||||
'size' => 6,
|
||||
'type' => 'text'
|
||||
|
||||
@@ -120,7 +120,7 @@ class AdminSuppliersControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Postcode/ Zip Code:'),
|
||||
'label' => $this->l('Postcode / Zip Code:'),
|
||||
'name' => 'postcode',
|
||||
'size' => 10,
|
||||
'maxlength' => 12,
|
||||
@@ -392,7 +392,7 @@ class AdminSuppliersControllerCore extends AdminController
|
||||
if (!($obj = $this->loadObject(true)))
|
||||
return;
|
||||
else if (SupplyOrder::supplierHasPendingOrders($obj->id))
|
||||
$this->errors[] = $this->l('It is not possible to delete a supplier if there is/are pending supply order(s).');
|
||||
$this->errors[] = $this->l('It is not possible to delete a supplier if there are any pending supply order.');
|
||||
else
|
||||
{
|
||||
$address = new Address($obj->id_address);
|
||||
|
||||
@@ -167,10 +167,10 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
{
|
||||
|
||||
if (Tools::isSubmit('addsupply_order') || Tools::isSubmit('submitAddsupply_order'))
|
||||
$this->toolbar_title = $this->l('Stock : Create new supply order');
|
||||
$this->toolbar_title = $this->l('Stock: Create new supply order');
|
||||
|
||||
if (Tools::isSubmit('updatesupply_order') || Tools::isSubmit('submitUpdatesupply_order'))
|
||||
$this->toolbar_title = $this->l('Stock : Manage supply order');
|
||||
$this->toolbar_title = $this->l('Stock: Manage supply order');
|
||||
|
||||
if (Tools::isSubmit('mod') && Tools::getValue('mod') === 'template' || $this->object->is_template)
|
||||
$this->toolbar_title .= ' ('.$this->l('template').')';
|
||||
@@ -203,7 +203,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
|
||||
$this->fields_form = array(
|
||||
'legend' => array(
|
||||
'title' => $this->l('Order informations'),
|
||||
'title' => $this->l('Order information'),
|
||||
'image' => '../img/admin/edit.gif'
|
||||
),
|
||||
'input' => array(
|
||||
@@ -213,7 +213,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'name' => 'reference',
|
||||
'size' => 50,
|
||||
'required' => true,
|
||||
'desc' => $this->l('This is the reference of your order.'),
|
||||
'desc' => $this->l('This is the reference for your order.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -225,8 +225,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'id' => 'id_supplier',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Select the supplier you are buying product from.'),
|
||||
'hint' => $this->l('Be careful ! When changing this field, all products already added to the order will be removed.')
|
||||
'desc' => $this->l('Select the supplier from whom you are buying products.'),
|
||||
'hint' => $this->l('Be careful! When changing this field, all products already added to the order will be removed.')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -238,7 +238,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'id' => 'id_warehouse',
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('Select the warehouse where you want the order to be sent to.'),
|
||||
'desc' => $this->l('Select the warehouse to which you want the order to be sent.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -251,7 +251,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'name' => 'name'
|
||||
),
|
||||
'desc' => $this->l('The currency of the order.'),
|
||||
'hint' => $this->l('Be careful ! When changing this field, all products already added to the order will be removed.')
|
||||
'hint' => $this->l('Be careful! When changing this field, all products already added to the order will be removed.')
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
@@ -271,7 +271,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'name' => 'discount_rate',
|
||||
'size' => 10,
|
||||
'required' => true,
|
||||
'desc' => $this->l('This is the global discount rate in percents for the order.'),
|
||||
'desc' => $this->l('This is the global discount rate in percent for the order.'),
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -280,11 +280,11 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'size' => 10,
|
||||
'required' => false,
|
||||
'hint' => $this->l('This will reset the order'),
|
||||
'desc' => $this->l('If specified, each product which quantity is less or equal to this value will be loaded.'),
|
||||
'desc' => $this->l('If specified, each product which quantity is less than or equal to this value will be loaded.'),
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save order '),
|
||||
'title' => $this->l('Save order'),
|
||||
)
|
||||
);
|
||||
|
||||
@@ -415,7 +415,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
public function renderList()
|
||||
{
|
||||
$this->displayInformation($this->l('This interface allows you to manage supply orders.').'<br />');
|
||||
$this->displayInformation($this->l('Also, you can create templates that you can later use to generate actual orders.').'<br />');
|
||||
$this->displayInformation($this->l('Also, you can create templates that you can use later to generate actual orders.').'<br />');
|
||||
|
||||
if (count($this->warehouses) <= 1)
|
||||
$this->displayWarning($this->l('You must have at least one warehouse before creating supply orders. See Stock/Warehouses'));
|
||||
@@ -470,7 +470,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
die;
|
||||
}
|
||||
else
|
||||
$this->displayWarning($this->l('There is nothing to export as CSV.'));
|
||||
$this->displayWarning($this->l('There is nothing to export as a CSV.'));
|
||||
}
|
||||
|
||||
// second list : templates
|
||||
@@ -505,7 +505,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
$this->_where .= ' AND a.id_warehouse = '.$this->getCurrentWarehouse();
|
||||
|
||||
// re-defines toolbar & buttons
|
||||
$this->toolbar_title = $this->l('Stock : Supply orders templates');
|
||||
$this->toolbar_title = $this->l('Stock: Supply orders templates');
|
||||
$this->initToolbar();
|
||||
unset($this->toolbar_btn['new']);
|
||||
$this->toolbar_btn['new'] = array(
|
||||
@@ -577,7 +577,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
),
|
||||
);
|
||||
|
||||
$this->displayInformation($this->l('Be careful when changing status. Some of them cannot be changed afterwards. (Canceled, for instance).'));
|
||||
$this->displayInformation($this->l('Be careful when changing status. Some of them cannot be changed afterwards (Canceled, for instance).'));
|
||||
|
||||
// sets up the helper
|
||||
$helper = new HelperForm();
|
||||
@@ -731,7 +731,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'search' => false,
|
||||
),
|
||||
'quantity_received_today' => array(
|
||||
'title' => $this->l('Quantity to receive today ?'),
|
||||
'title' => $this->l('Quantity received today?'),
|
||||
'align' => 'left',
|
||||
'width' => 20,
|
||||
'type' => 'editable',
|
||||
@@ -781,7 +781,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
$this->addRowAction('details');
|
||||
|
||||
// sets toolbar title with order reference
|
||||
$this->toolbar_title = sprintf($this->l('Reception of products for supply order #%s'), $supply_order->reference);
|
||||
$this->toolbar_title = sprintf($this->l('Receipt of products for supply order #%s'), $supply_order->reference);
|
||||
|
||||
$this->lang = false;
|
||||
$lang_id = (int)$this->context->language->id; //employee lang
|
||||
@@ -823,7 +823,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
$helper->currentIndex = self::$currentIndex.$action;
|
||||
|
||||
// display these global order informations
|
||||
$this->displayInformation($this->l('This interface allows you to update the quantities of this on-going order.').'<br />');
|
||||
$this->displayInformation($this->l('This interface allows you to update the quantities of this ongoing order.').'<br />');
|
||||
$this->displayInformation($this->l('Be careful : once you update, you cannot go back unless you add new negative stock movements.').'<br />');
|
||||
$this->displayInformation($this->l('Please not that a green line means that you received what you expected, and a red line means that you received more than expected.').'<br />');
|
||||
|
||||
@@ -991,10 +991,10 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
|
||||
$error_str = '<ul>';
|
||||
foreach ($errors as $e)
|
||||
$error_str .= '<li>'.$this->l('field ').$e.'</li>';
|
||||
$error_str .= '<li>'.$this->l('field').$e.'</li>';
|
||||
$error_str .= '</ul>';
|
||||
|
||||
$this->errors[] = Tools::displayError($this->l('Please verify the informations of the product: ').$entry->name.' '.$error_str);
|
||||
$this->errors[] = Tools::displayError($this->l('Please verify the product information:').$entry->name.' '.$error_str);
|
||||
}
|
||||
else
|
||||
$entry->save();
|
||||
@@ -1105,7 +1105,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
&& Tools::isSubmit('id_supply_order_state'))
|
||||
{
|
||||
if ($this->tabAccess['edit'] != '1')
|
||||
$this->errors[] = Tools::displayError($this->l('You do not have permissions to change order status.'));
|
||||
$this->errors[] = Tools::displayError($this->l('You do not have permission to change the order status.'));
|
||||
|
||||
// get state ID
|
||||
$id_state = (int)Tools::getValue('id_supply_order_state', 0);
|
||||
@@ -1378,7 +1378,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
$supply_order->save();
|
||||
}
|
||||
else
|
||||
$this->errors[] = Tools::displayError($this->l('Something went wrong when adding products in warehouse'));
|
||||
$this->errors[] = Tools::displayError($this->l('Something went wrong when adding products to the warehouse'));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1401,7 +1401,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
public function displayUpdateReceiptLink($token = null, $id)
|
||||
{
|
||||
if (!array_key_exists('Receipt', self::$cache_lang))
|
||||
self::$cache_lang['Receipt'] = $this->l('Update on-going receptions');
|
||||
self::$cache_lang['Receipt'] = $this->l('Update ongoing receipt of products');
|
||||
|
||||
$this->context->smarty->assign(array(
|
||||
'href' => self::$currentIndex.
|
||||
@@ -1688,9 +1688,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
if (Validate::isLoadedObject($supply_order))
|
||||
{
|
||||
if (!$supply_order->is_template)
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed informations on your order.').'<br />');
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed information on your order.').'<br />');
|
||||
else
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed informations on your template of order.').'<br />');
|
||||
$this->displayInformation($this->l('This interface allows you to display detailed information on your order template.').'<br />');
|
||||
|
||||
$lang_id = (int)$supply_order->id_lang;
|
||||
|
||||
@@ -1755,7 +1755,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'search' => false,
|
||||
),
|
||||
'unit_price_te' => array(
|
||||
'title' => $this->l('Unit price (te)'),
|
||||
'title' => $this->l('Unit price (tax excl.)'),
|
||||
'align' => 'right',
|
||||
'width' => 80,
|
||||
'orderby' => false,
|
||||
@@ -1773,7 +1773,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'search' => false,
|
||||
),
|
||||
'price_te' => array(
|
||||
'title' => $this->l('Price (te)'),
|
||||
'title' => $this->l('Price (tax excl.)'),
|
||||
'align' => 'right',
|
||||
'width' => 80,
|
||||
'orderby' => false,
|
||||
@@ -1792,7 +1792,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'suffix' => '%',
|
||||
),
|
||||
'discount_value_te' => array(
|
||||
'title' => $this->l('Discount value (te)'),
|
||||
'title' => $this->l('Discount value (tax excl.)'),
|
||||
'align' => 'right',
|
||||
'width' => 80,
|
||||
'orderby' => false,
|
||||
@@ -1802,7 +1802,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'currency' => true,
|
||||
),
|
||||
'price_with_discount_te' => array(
|
||||
'title' => $this->l('Price with product discount (te)'),
|
||||
'title' => $this->l('Price with product discount (tax excl.)'),
|
||||
'align' => 'right',
|
||||
'width' => 80,
|
||||
'orderby' => false,
|
||||
@@ -1831,7 +1831,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
'currency' => true,
|
||||
),
|
||||
'price_ti' => array(
|
||||
'title' => $this->l('Price (ti)'),
|
||||
'title' => $this->l('Price (tax incl.)'),
|
||||
'align' => 'right',
|
||||
'width' => 80,
|
||||
'orderby' => false,
|
||||
@@ -2100,7 +2100,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
|
||||
$id_supply_order = (int)Tools::getValue('id_supply_order');
|
||||
$supply_order = new SupplyOrder($id_supply_order);
|
||||
if (!Validate::isLoadedObject($supply_order))
|
||||
$this->errors[] = Tools::displayError($this->l('Could not copy this template.'));
|
||||
$this->errors[] = Tools::displayError($this->l('This template could not be copied.'));
|
||||
|
||||
// gets SupplyOrderDetail
|
||||
$entries = $supply_order->getEntriesCollection($supply_order->id_lang);
|
||||
|
||||
@@ -244,7 +244,7 @@ class AdminTabsControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
|
||||
@@ -116,7 +116,7 @@ class AdminTagsControllerCore extends AdminController
|
||||
'products_unselected' => $obj->getProducts(false)
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save '),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
|
||||
@@ -92,7 +92,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
'width' => 140
|
||||
),
|
||||
'zipcode' => array(
|
||||
'title' => $this->l('ZipCodes'),
|
||||
'title' => $this->l('Zip Codes'),
|
||||
'width' => 25,
|
||||
),
|
||||
'behavior' => array(
|
||||
@@ -251,7 +251,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('ZipCode range:'),
|
||||
'label' => $this->l('Zip Code range:'),
|
||||
'name' => 'zipcode',
|
||||
'required' => false,
|
||||
'hint' => $this->l('You can define a range (eg: 75000-75015) or a simple zipcode')
|
||||
@@ -408,7 +408,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
|
||||
if (count($this->errors) == 0)
|
||||
if (!$tr->save())
|
||||
$this->errors[] = Tools::displayError('An error has occured: Can\'t save the current tax rule');
|
||||
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current tax rule');
|
||||
else
|
||||
Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'='.$tr->id_tax_rules_group.'&conf=4&update'.$this->table.'&token='.$this->token);
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ class AdminTaxesControllerCore extends AdminController
|
||||
);
|
||||
|
||||
if (Configuration::get('PS_USE_ECOTAX'))
|
||||
$this->options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g., French ecotax: 19.6%).'),
|
||||
$this->options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g. French ecotax: 19.6%).'),
|
||||
'cast' => 'intval', 'type' => 'select', 'identifier' => 'id_tax', 'identifier' => 'id_tax_rules_group', 'list' => TaxRulesGroup::getTaxRulesGroupsForOptions());
|
||||
|
||||
parent::__construct();
|
||||
@@ -78,7 +78,7 @@ class AdminTaxesControllerCore extends AdminController
|
||||
self::$cache_lang['DeleteItem'] = $this->l('Delete item #', __CLASS__, true, false);
|
||||
|
||||
if (TaxRule::isTaxInUse($id))
|
||||
$confirm = $this->l('This tax is currently in use in a tax rule. Are you sure?');
|
||||
$confirm = $this->l('This tax is currently in use in a tax rule. Are you sure you would like to continue?');
|
||||
|
||||
$this->context->smarty->assign(array(
|
||||
'href' => self::$currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token),
|
||||
@@ -102,7 +102,7 @@ class AdminTaxesControllerCore extends AdminController
|
||||
public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null)
|
||||
{
|
||||
if ($value && TaxRule::isTaxInUse($id))
|
||||
$confirm = $this->l('This tax is currently in use in a tax rule. If you continue this tax will be removed from the tax rule, are you sure?');
|
||||
$confirm = $this->l('This tax is currently in use in a tax rule. If you continue, this tax will be removed from the tax rule. Are you sure you would like to continue?');
|
||||
|
||||
$tpl_enable = $this->context->smarty->createTemplate('helpers/list/list_action_enable.tpl');
|
||||
$tpl_enable->assign(array(
|
||||
@@ -131,7 +131,7 @@ class AdminTaxesControllerCore extends AdminController
|
||||
'required' => true,
|
||||
'lang' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('Tax name to display in cart and on invoice, e.g., VAT')
|
||||
'desc' => $this->l('Tax name to display in cart and on invoice, e.g. VAT')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -141,7 +141,7 @@ class AdminTaxesControllerCore extends AdminController
|
||||
'maxlength' => 6,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}',
|
||||
'desc' => $this->l('Format: XX.XX or XX.XXX (e.g., 19.60 or 13.925)')
|
||||
'desc' => $this->l('Format: XX.XX or XX.XXX (e.g. 19.60 or 13.925)')
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
|
||||
@@ -102,7 +102,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
$this->options = array(
|
||||
'theme' => array(
|
||||
'title' => sprintf($this->l('Select theme for shop %s'), $this->context->shop->name),
|
||||
'description' => (!$this->can_display_themes) ? $this->l('You must select a shop in top list if you want to select a theme') : '',
|
||||
'description' => (!$this->can_display_themes) ? $this->l('You must select a shop from the above list if you want to select a theme') : '',
|
||||
'fields' => array(
|
||||
'theme_for_shop' => array(
|
||||
'type' => 'theme',
|
||||
@@ -125,8 +125,8 @@ class AdminThemesControllerCore extends AdminController
|
||||
'PS_LOGO_MAIL' => array(
|
||||
'title' => $this->l('Mail logo:'),
|
||||
'desc' =>
|
||||
((Configuration::get('PS_LOGO_MAIL') === false) ? '<span class="light-warning">'.$this->l('Warning: No email logo defined, the header logo is used instead.').'</span><br />' : '').
|
||||
$this->l('Will appear on e-mail headers, if undefined the Header logo will be used'),
|
||||
((Configuration::get('PS_LOGO_MAIL') === false) ? '<span class="light-warning">'.$this->l('Warning: No e-mail logo defined, the header logo is used instead.').'</span><br />' : '').
|
||||
$this->l('Will appear on e-mail headers. If undefined, the Header logo will be used'),
|
||||
'type' => 'file',
|
||||
'thumb' => (Configuration::get('PS_LOGO_MAIL') !== false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'))) ? _PS_IMG_.Configuration::get('PS_LOGO_MAIL').'?date='.time() : _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time()
|
||||
),
|
||||
@@ -134,7 +134,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
'title' => $this->l('Invoice logo:'),
|
||||
'desc' =>
|
||||
((Configuration::get('PS_LOGO_INVOICE') === false) ? '<span class="light-warning">'.$this->l('Warning: No invoice logo defined, the header logo is used instead.').'</span><br />' : '').
|
||||
$this->l('Will appear on invoices headers, if undefined the Header logo will be used'),
|
||||
$this->l('Will appear on invoice headers. If undefined, the Header logo will be used'),
|
||||
'type' => 'file',
|
||||
'thumb' => (Configuration::get('PS_LOGO_INVOICE') !== false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE'))) ? _PS_IMG_.Configuration::get('PS_LOGO_INVOICE').'?date='.time() : _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time()
|
||||
),
|
||||
@@ -160,7 +160,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
'size' => 20
|
||||
),
|
||||
),
|
||||
'submit' => array('title' => $this->l(' Save '), 'class' => 'button')
|
||||
'submit' => array('title' => $this->l('Save'), 'class' => 'button')
|
||||
),
|
||||
);
|
||||
|
||||
@@ -214,7 +214,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
),
|
||||
),
|
||||
'submit' => array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
)
|
||||
);
|
||||
@@ -234,7 +234,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
'type' => 'select',
|
||||
'name' => 'based_on',
|
||||
'label' => $this->l('Copy missing files from existing theme:'),
|
||||
'desc' => $this->l('If you create a new theme, it\'s recommended to use default theme files for basic.'),
|
||||
'desc' => $this->l('If you create a new theme, it\'s recommended to use default theme files.'),
|
||||
'options' => array(
|
||||
'id' => 'id', 'name' => 'name',
|
||||
'default' => array('value' => 0, 'label' => ' - '),
|
||||
@@ -325,7 +325,7 @@ class AdminThemesControllerCore extends AdminController
|
||||
$obj = $this->loadObject();
|
||||
if ($obj && $obj->isUsed())
|
||||
{
|
||||
$this->errors[] = $this->l('This theme is used by at least one shop. Please choose another theme first.');
|
||||
$this->errors[] = $this->l('This theme is already used by at least one shop. Please choose another theme first.');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ class AdminTrackingControllerCore extends AdminController
|
||||
public function initContent()
|
||||
{
|
||||
if (!Configuration::get('PS_STOCK_MANAGEMENT'))
|
||||
$this->warnings[] = $this->l('List of products without available quantities for sale are not displayed because stock management is disable.');
|
||||
$this->warnings[] = $this->l('List of products without available quantities for sale are not displayed because stock management is disabled.');
|
||||
|
||||
$methods = get_class_methods($this);
|
||||
$tpl_vars['arrayList'] = array();
|
||||
|
||||
@@ -68,7 +68,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
$this->content .= $this->{$method_name}(Tools::strtolower(Tools::getValue('lang')));
|
||||
else
|
||||
{
|
||||
$this->errors[] = sprintf(Tools::displayError('"%s" does not exists. Maybe you typed the url manually.'), $type);
|
||||
$this->errors[] = sprintf(Tools::displayError('\\"%s\\" does not exist. Maybe you typed the URL manually.'), $type);
|
||||
$this->content .= $this->initMain();
|
||||
}
|
||||
}
|
||||
@@ -98,7 +98,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
'back' => $this->l('Back Office translations'),
|
||||
'errors' => $this->l('Error message translations'),
|
||||
'fields' => $this->l('Field name translations'),
|
||||
'modules' => $this->l('Translations of installed modules'),
|
||||
'modules' => $this->l('Installed module translations'),
|
||||
'pdf' => $this->l('PDF translations'),
|
||||
'mails' => $this->l('E-mail template translations'),
|
||||
);
|
||||
@@ -181,7 +181,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
if (!mkdir($path, 0777, true))
|
||||
{
|
||||
$bool &= false;
|
||||
$this->errors[] = $this->l('Cannot create the folder').' "'.$path.'". '.$this->l('Check directory writing permissions.');
|
||||
$this->errors[] = $this->l('Cannot create the folder').' "'.$path.'". '.$this->l('Check directory writing permisions.');
|
||||
}
|
||||
}
|
||||
return $bool;
|
||||
@@ -214,13 +214,13 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
public function submitCopyLang()
|
||||
{
|
||||
if (!($from_lang = strval(Tools::getValue('fromLang'))) || !($to_lang = strval(Tools::getValue('toLang'))))
|
||||
$this->errors[] = $this->l('you must select 2 languages in order to copy data from one to another');
|
||||
$this->errors[] = $this->l('You must select 2 languages in order to copy data from one to another');
|
||||
else if (!($from_theme = strval(Tools::getValue('fromTheme'))) || !($to_theme = strval(Tools::getValue('toTheme'))))
|
||||
$this->errors[] = $this->l('you must select 2 themes in order to copy data from one to another');
|
||||
$this->errors[] = $this->l('You must select 2 themes in order to copy data from one to another');
|
||||
else if (!Language::copyLanguageData(Language::getIdByIso($from_lang), Language::getIdByIso($to_lang)))
|
||||
$this->errors[] = $this->l('an error occurred while copying data');
|
||||
$this->errors[] = $this->l('An error occurred while copying data');
|
||||
else if ($from_lang == $to_lang && $from_theme == $to_theme)
|
||||
$this->errors[] = $this->l('nothing to copy! (same language and theme)');
|
||||
$this->errors[] = $this->l('Nothing to copy! (same language and theme)');
|
||||
if (count($this->errors))
|
||||
return;
|
||||
|
||||
@@ -236,7 +236,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
}
|
||||
if ($bool)
|
||||
Tools::redirectAdmin(self::$currentIndex.'&conf=14&token='.$this->token);
|
||||
$this->errors[] = $this->l('a part of the data has been copied but some language files could not be found or copied');
|
||||
$this->errors[] = $this->l('A part of the data has been copied but some language files could not be found or copied');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -274,7 +274,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
Tools::redirectLink(Tools::getCurrentUrlProtocolPrefix().Tools::getShopDomain().__PS_BASE_URI__.'translations/export/'.$lang.'.gzip');
|
||||
$this->errors[] = Tools::displayError('An error occurred while creating archive.');
|
||||
}
|
||||
$this->errors[] = Tools::displayError('Please choose a language and theme.');
|
||||
$this->errors[] = Tools::displayError('Please choose a language and a theme.');
|
||||
}
|
||||
|
||||
public function checkAndAddMailsFiles($iso_code, $files_list)
|
||||
@@ -385,7 +385,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
if (!file_exists($file_name))
|
||||
file_put_contents($file_name, '');
|
||||
if (!is_writable($file_name))
|
||||
die ($this->l('Cannot write the theme\'s language file ').'('.$file_name.')'.$this->l('. Please check write permissions.'));
|
||||
die ($this->l('Cannot write to the theme\'s language file ').'('.$file_name.')'.$this->l('Please check write permissions.'));
|
||||
|
||||
// this string is initialized one time for a file
|
||||
$str_write .= "<?php\n\nglobal \$_MODULE;\n\$_MODULE = array();\n";
|
||||
@@ -502,7 +502,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
/* PrestaShop demo mode */
|
||||
if (_PS_MODE_DEMO_)
|
||||
{
|
||||
$this->errors[] = Tools::displayError('This functionnality has been disabled.');
|
||||
$this->errors[] = Tools::displayError('This functionality has been disabled.');
|
||||
return;
|
||||
}
|
||||
/* PrestaShop demo mode*/
|
||||
@@ -814,8 +814,8 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
|
||||
$language_code = Tools::htmlentitiesUTF8(Language::getLanguageCodeByIso(Tools::getValue('lang')));
|
||||
return array('language_code' => $language_code,
|
||||
'not_available' => addslashes(html_entity_decode($this->l('this language is not available on Google Translate API'), ENT_QUOTES, 'utf-8')),
|
||||
'tooltip_title' => addslashes(html_entity_decode($this->l('Google translate suggests :'), ENT_QUOTES, 'utf-8'))
|
||||
'not_available' => addslashes(html_entity_decode($this->l('this language is not available in Google Translate\'s API'), ENT_QUOTES, 'utf-8')),
|
||||
'tooltip_title' => addslashes(html_entity_decode($this->l('Google Translate suggests :'), ENT_QUOTES, 'utf-8'))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -894,7 +894,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
|
||||
$this->tpl_view_vars = array(
|
||||
'lang' => Tools::strtoupper($lang),
|
||||
'translation_type' => $this->l('Front-Office translations'),
|
||||
'translation_type' => $this->l('Front Office translations'),
|
||||
'missing_translations' => $missing_translations,
|
||||
'count' => $count,
|
||||
'limit_warning' => $this->displayLimitPostWarning($count),
|
||||
@@ -1073,7 +1073,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
|
||||
$this->tpl_view_vars = array(
|
||||
'lang' => Tools::strtoupper($lang),
|
||||
'translation_type' => $this->l('Back-Office translations'),
|
||||
'translation_type' => $this->l('Back Office translations'),
|
||||
'count' => $count,
|
||||
'limit_warning' => $this->displayLimitPostWarning($count),
|
||||
'post_limit_exceeded' => $this->post_limit_exceed,
|
||||
@@ -1108,7 +1108,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
_PS_ADMIN_DIR_.'/../override/controllers/admin/',
|
||||
_PS_ADMIN_DIR_.'/');
|
||||
if (!file_exists(_PS_MODULE_DIR_))
|
||||
die($this->displayWarning(Tools::displayError('Fatal error: Module directory is not here anymore ').'('._PS_MODULE_DIR_.')'));
|
||||
die($this->displayWarning(Tools::displayError('Fatal error: Module directory does not exist').'('._PS_MODULE_DIR_.')'));
|
||||
if (!is_writable(_PS_MODULE_DIR_))
|
||||
$this->displayWarning(Tools::displayError('The module directory must be writable'));
|
||||
if (!$modules = scandir(_PS_MODULE_DIR_))
|
||||
@@ -1438,12 +1438,12 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
<div>';
|
||||
$str_return .= '
|
||||
<div class="label-subject">
|
||||
<b>'.$this->l('"title" tag:').'</b> '.(isset($title['en']) ? $title['en'] : '').'<br />
|
||||
<b>'.$this->l('\\"title\\" tag:').'</b> '.(isset($title['en']) ? $title['en'] : '').'<br />
|
||||
<input type="text" name="title_'.$group_name.'_'.$mail_name.'" value="'.(isset($title[$lang]) ? $title[$lang] : '').'" />
|
||||
</div><!-- .label-subject -->';
|
||||
$str_return .= '
|
||||
<iframe style="background:white;border:1px solid #DFD5C3;" border="0" src ="'.$url.'?'.(rand(0, 1000000000000)).'" width="565" height="497"></iframe>
|
||||
<a style="display:block;margin-top:5px;width:130px;" href="#" onclick="$(this).parent().hide(); displayTiny($(this).parent().next()); return false;" class="button">'.$this->l('Edit this mail template').'</a>
|
||||
<a style="display:block;margin-top:5px;width:130px;" href="#" onclick="$(this).parent().hide(); displayTiny($(this).parent().next()); return false;" class="button">'.$this->l('Edit this e-mail template').'</a>
|
||||
</div>
|
||||
<textarea style="display:none;" class="rte mailrte" cols="80" rows="30" name="'.$group_name.'[html]['.($name_for_module ? $name_for_module.'|' : '' ).$mail_name.']">'.(isset($content[$lang]) ? Tools::htmlentitiesUTF8(stripslashes($content[$lang])) : '').'</textarea>
|
||||
</div><!-- .mail-form -->
|
||||
@@ -1535,7 +1535,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
{
|
||||
$theme_mails[$module_dir] = $this->getMailFiles(_PS_THEME_DIR_.'modules/'.$module_dir.'/mails/', $lang, 'theme_module_mail');
|
||||
$theme_mails[$module_dir]['subject'] = $theme_mails['theme_mail']['subject'];
|
||||
$title = $theme_or_module_name != 'theme_mail' ? ucfirst(_THEME_NAME_).' '.sprintf($this->l('E-mails for %s module'), '<em>'.$theme_or_module_name.'</em>') : ucfirst(_THEME_NAME_).' '.$this->l('e-mails');
|
||||
$title = $theme_or_module_name != 'theme_mail' ? ucfirst(_THEME_NAME_).' '.sprintf($this->l('E-mails for %s module'), '<em>'.$theme_or_module_name.'</em>') : ucfirst(_THEME_NAME_).' '.$this->l('E-mails');
|
||||
$theme_mails[$module_dir]['display'] = $this->displayMailContent($theme_mails[$module_dir], $subject_mail, $obj_lang, 'theme_'.Tools::strtolower($theme_or_module_name), $title, ($theme_or_module_name != 'theme_mail' ? $theme_or_module_name : false));
|
||||
}
|
||||
}
|
||||
@@ -1730,7 +1730,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
$this->all_iso_lang[] = $language['iso_code'];
|
||||
|
||||
if (!file_exists(_PS_MODULE_DIR_))
|
||||
die($this->displayWarning(Tools::displayError('Fatal error: Module directory is not here anymore ').'('._PS_MODULE_DIR_.')'));
|
||||
die($this->displayWarning(Tools::displayError('Fatal error: Module directory does not exist').'('._PS_MODULE_DIR_.')'));
|
||||
if (!is_writable(_PS_MODULE_DIR_))
|
||||
$this->displayWarning(Tools::displayError('The module directory must be writable'));
|
||||
if (!$modules = scandir(_PS_MODULE_DIR_))
|
||||
@@ -1763,7 +1763,7 @@ class AdminTranslationsControllerCore extends AdminController
|
||||
$this->tpl_view_vars = array(
|
||||
'default_theme_name' => self::DEFAULT_THEME_NAME,
|
||||
'lang' => Tools::strtoupper($lang),
|
||||
'translation_type' => $this->l('Translations of installed modules'),
|
||||
'translation_type' => $this->l('Installed module translations'),
|
||||
'count' => $this->total_expression,
|
||||
'limit_warning' => $this->displayLimitPostWarning($this->total_expression),
|
||||
'post_limit_exceeded' => $this->post_limit_exceed,
|
||||
|
||||
@@ -110,9 +110,9 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
// display help informations
|
||||
$this->displayInformation($this->l('This interface allows you to manage your warehouses.').'<br />');
|
||||
$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the general default currency used.').'<br />');
|
||||
$this->displayInformation($this->l('Futhermore, for each warehouse, you have to check :'));
|
||||
$this->displayInformation($this->l('Furthermore, for each warehouse, you should check:'));
|
||||
$this->displayInformation($this->l('the management type (according to the law in your country), the valuation currency, its associated carriers and shops.').'<br />');
|
||||
$this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its valuation, the number of products and quantities stored, ...')
|
||||
$this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its overall value, the number of products and quantities stored, etc.')
|
||||
.'<br /><br />');
|
||||
$this->displayInformation($this->l('Be careful, products from different warehouses will need to be shipped in different packages.'));
|
||||
|
||||
@@ -137,7 +137,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
$employees_array = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
|
||||
|
||||
// sets the title of the toolbar
|
||||
$this->toolbar_title = $this->l('Stock : Warehouse management');
|
||||
$this->toolbar_title = $this->l('Stock: Warehouse management');
|
||||
|
||||
// sets the fields of the form
|
||||
$this->fields_form = array(
|
||||
@@ -157,7 +157,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
'size' => 30,
|
||||
'maxlength' => 32,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Reference of this warehouse'),
|
||||
'desc' => $this->l('Reference for this warehouse'),
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -175,7 +175,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
'name' => 'phone',
|
||||
'size' => 15,
|
||||
'maxlength' => 16,
|
||||
'desc' => $this->l('Phone number of this warehouse')
|
||||
'desc' => $this->l('Phone number for this warehouse')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -195,7 +195,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Postcode/ Zip Code:'),
|
||||
'label' => $this->l('Postcode / Zip Code:'),
|
||||
'name' => 'postcode',
|
||||
'size' => 10,
|
||||
'maxlength' => 12,
|
||||
@@ -224,7 +224,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
),
|
||||
array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('State'),
|
||||
'label' => $this->l('State:'),
|
||||
'name' => 'id_state',
|
||||
'required' => true,
|
||||
'options' => array(
|
||||
@@ -280,14 +280,14 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
$this->fields_form['input'][] = array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Management type:'),
|
||||
'hint' => $this->l('Careful ! You won\'t be able to change this value later!'),
|
||||
'hint' => $this->l('Careful! You won\'t be able to change this value later!'),
|
||||
'name' => 'management_type',
|
||||
'required' => true,
|
||||
'options' => array(
|
||||
'query' => array(
|
||||
array(
|
||||
'id' => 'WA',
|
||||
'name' => $this->l('Weight Average')
|
||||
'name' => $this->l('Average Weight')
|
||||
),
|
||||
array(
|
||||
'id' => 'FIFO',
|
||||
@@ -315,7 +315,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
$this->fields_form['input'][] = array(
|
||||
'type' => 'select',
|
||||
'label' => $this->l('Stock valuation currency:'),
|
||||
'hint' => $this->l('Careful ! You won\'t be able to change this value later!'),
|
||||
'hint' => $this->l('Careful! You won\'t be able to change this value later!'),
|
||||
'name' => 'id_currency',
|
||||
'required' => true,
|
||||
'options' => array(
|
||||
@@ -339,7 +339,7 @@ class AdminWarehousesControllerCore extends AdminController
|
||||
}
|
||||
|
||||
$this->fields_form['submit'] = array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save'),
|
||||
'class' => 'button'
|
||||
);
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ class AdminWebserviceControllerCore extends AdminController
|
||||
'PS_WEBSERVICE' => array('title' => $this->l('Enable PrestaShop Webservice:'),
|
||||
'desc' => $this->l('Before activating the webservice, you must be sure to: ').
|
||||
'<ol>
|
||||
<li>'.$this->l('be certain URL rewrite is available on this server').'</li>
|
||||
<li>'.$this->l('be certain that URL rewriting is available on this server').'</li>
|
||||
<li>'.$this->l('be certain that the 5 methods GET, POST, PUT, DELETE and HEAD are supported by this server').'</li>
|
||||
</ol>',
|
||||
'cast' => 'intval',
|
||||
@@ -241,7 +241,7 @@ class AdminWebserviceControllerCore extends AdminController
|
||||
if (!in_array('mod_auth_basic', $apache_modules))
|
||||
$this->warnings[] = $this->l('Please activate the Apache module \'mod_auth_basic\' to allow authentication of PrestaShop webservice.');
|
||||
if (!in_array('mod_rewrite', $apache_modules))
|
||||
$this->warnings[] = $this->l('Please activate the Apache module \'mod_rewrite\' to allow using the PrestaShop webservice.');
|
||||
$this->warnings[] = $this->l('Please activate the Apache module \'mod_rewrite\' to allow the PrestaShop webservice.');
|
||||
}
|
||||
else
|
||||
$this->warnings[] = $this->l('We could not check if basic authentication and rewrite extensions are activated.
|
||||
|
||||
@@ -82,7 +82,7 @@ class AdminZonesControllerCore extends AdminController
|
||||
'name' => 'name',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
'desc' => $this->l('Zone name, e.g., Africa, West Coast, Neighboring Countries'),
|
||||
'desc' => $this->l('Zone name (e.g. Africa, West Coast, Neighboring Countries)'),
|
||||
),
|
||||
array(
|
||||
'type' => 'radio',
|
||||
@@ -118,7 +118,7 @@ class AdminZonesControllerCore extends AdminController
|
||||
}
|
||||
|
||||
$this->fields_form['submit'] = array(
|
||||
'title' => $this->l(' Save '),
|
||||
'title' => $this->l('Save '),
|
||||
'class' => 'button'
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user