dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//Changed English strings using the translationsenglish module.

Browse Source
This commit is contained in:
djfm
2013-01-04 16:58:58 +01:00
parent 507309ddf5
commit 385c593129
319 changed files with 5991 additions and 5991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAccessController.php
+1 -1
View File
@@ -86,7 +86,7 @@ class AdminAccessControllerCore extends AdminController
if ($m)
$module['name'] = $m->displayName;
else
$this->warnings[] = sprintf($this->l('%s: module is installed in database, but its files are missing or incompatible.'), '<b>'.$module['name'].'</b>');
$this->warnings[] = sprintf($this->l('%s module is installed in the database but its files are missing/incompatible.'), '<b>'.$module['name'].'</b>');
}
}
controllers/admin/AdminAddressesController.php
+7 -7
View File
@@ -53,10 +53,10 @@ class AdminAddressesControllerCore extends AdminController
$this->fields_list = array(
'id_address' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'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'),
'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('Postal Code/Zip Code'), 'align' => 'right', 'width' => 80),
'postcode' => array('title' => $this->l('Zip/Postal 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'));
@@ -141,7 +141,7 @@ class AdminAddressesControllerCore extends AdminController
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
@@ -208,7 +208,7 @@ class AdminAddressesControllerCore extends AdminController
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Last name'),
'label' => $this->l('Last Name'),
'name' => 'lastname',
'size' => 33,
'required' => true,
@@ -228,7 +228,7 @@ class AdminAddressesControllerCore extends AdminController
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('First name'),
'label' => $this->l('First Name'),
'name' => 'firstname',
'size' => 33,
'required' => true,
@@ -260,7 +260,7 @@ class AdminAddressesControllerCore extends AdminController
{
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Postal Code/Zip Code'),
'label' => $this->l('Zip/Postal Code'),
'name' => 'postcode',
'size' => 33,
'required' => true,
controllers/admin/AdminAdminPreferencesController.php
+16 -16
View File
@@ -47,15 +47,15 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PRESTASTORE_LIVE' => array(
'title' => $this->l('Automatically check for module updates'),
'desc' => $this->l('New modules and updates are displayed on the modules page'),
'desc' => $this->l('New modules and updates are displayed on the modules page.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_CHECKIP' => array(
'title' => $this->l('Check IP on the cookie'),
'desc' => $this->l('Check the IP address of the cookie in order to avoid your cookie being stolen'),
'title' => $this->l('Check the IP address on the cookie'),
'desc' => $this->l('Check the IP address of the cookie in order to prevent your cookie from being stolen.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -63,7 +63,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_LIFETIME_FO' => array(
'title' => $this->l('Lifetime of the Front Office cookie'),
'title' => $this->l('Lifetime of Front Office cookies'),
'desc' => $this->l('Indicate the number of hours'),
'validation' => 'isInt',
'cast' => 'intval',
@@ -72,7 +72,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_LIFETIME_BO' => array(
'title' => $this->l('Lifetime of the Back Office cookie'),
'title' => $this->l('Lifetime of Back Office cookies'),
'desc' => $this->l('Indicate the number of hours'),
'validation' => 'isInt',
'cast' => 'intval',
@@ -88,31 +88,31 @@ class AdminAdminPreferencesControllerCore extends AdminController
'icon' => 'tab-preferences',
'fields' => array(
'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
'title' => $this->l('Attachment maximum size'),
'desc' => $this->l('Set the maximum size of attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
'title' => $this->l('Maximum size for attachment'),
'desc' => $this->l('Set the maximum size allowed for attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
((int)str_replace('M', '', ini_get('post_max_size')) > (int)str_replace('M', '', ini_get('upload_max_filesize')) ? ini_get('upload_max_filesize') : ini_get('post_max_size')),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '2'
),
'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
'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),
'desc' => $this->l('Define the limit upload for a downloadable product. This value has to be less than or equal to the maximum file upload allotted by your server. ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '1'
),
'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
'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),
'desc' => $this->l('Define the limit upload for an image. This value has to be less than or equal to the maximum file upload allotted by your server. ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '1'
),
),
@@ -123,7 +123,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PS_HELPBOX' => array(
'title' => $this->l('Back Office help boxes'),
'desc' => $this->l('Enable yellow help boxes which are displayed under form fields in the Back Office'),
'desc' => $this->l('Allow yellow help boxes to be displayed under the form fields in the Back Office.'),
'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 are made on your shop'),
'desc' => $this->l('This will display notifications when new orders are made in 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 register on your shop'),
'desc' => $this->l('This will display notifications every time a new customer registers in 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 are posted on your shop'),
'desc' => $this->l('This will display notifications when new messages are posted in your shop.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/admin/AdminAttachmentsController.php
+6 -6
View File
@@ -83,11 +83,11 @@ class AdminAttachmentsControllerCore extends AdminController
'type' => 'file',
'label' => $this->l('File:'),
'name' => 'file',
'desc' => $this->l('Upload file from your computer')
'desc' => $this->l('Upload a file from your computer.')
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
@@ -145,7 +145,7 @@ class AdminAttachmentsControllerCore extends AdminController
{
if ($_FILES['file']['size'] > (Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024 * 1024))
$this->errors[] = sprintf(
$this->l('File too large, maximum size allowed: %1$d kB. File size you\'re trying to upload is: %2$d kB.'),
$this->l('The file is too large. Maximum size allowed is: %1$d kB. The file you\'re trying to upload is: %2$d kB.'),
(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024),
number_format(($_FILES['file']['size'] / 1024), 2, '.', '')
);
@@ -154,7 +154,7 @@ class AdminAttachmentsControllerCore extends AdminController
do $uniqid = sha1(microtime());
while (file_exists(_PS_DOWNLOAD_DIR_.$uniqid));
if (!copy($_FILES['file']['tmp_name'], _PS_DOWNLOAD_DIR_.$uniqid))
$this->errors[] = $this->l('File copy failed');
$this->errors[] = $this->l('Failed to copy the file.');
$_POST['file_name'] = $_FILES['file']['name'];
@unlink($_FILES['file']['tmp_name']);
$_POST['file'] = $uniqid;
@@ -167,13 +167,13 @@ class AdminAttachmentsControllerCore extends AdminController
$max_post = (int)ini_get('post_max_size');
$upload_mb = min($max_upload, $max_post);
$this->errors[] = sprintf(
$this->l('The File %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
$this->l('The file %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
'<b>'.$_FILES['file']['name'].'</b> ',
'<b>'.$upload_mb.'</b>'
);
}
else if (!empty($_FILES['file']['tmp_name']))
$this->errors[] = $this->l('No file or your file is not uploadable, please check your server configuration for the maximum upload size.');
$this->errors[] = $this->l('Upload error. Please check your server configurations for the maximum upload size allowed.');
}
$this->validateRules();
}
controllers/admin/AdminAttributeGeneratorController.php
+2 -2
View File
@@ -222,7 +222,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
{
$this->toolbar_btn['back'] = array(
'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
'desc' => $this->l('Back to product')
'desc' => $this->l('Back to the product')
);
}
@@ -230,7 +230,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').'
$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>');
return;
controllers/admin/AdminAttributesGroupsController.php
+8 -8
View File
@@ -237,7 +237,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -330,7 +330,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
);
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -430,7 +430,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').
$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;
@@ -497,11 +497,11 @@ class AdminAttributesGroupsControllerCore extends AdminController
default: // list
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new Attributes')
'desc' => $this->l('Add New Attributes')
);
$this->toolbar_btn['newAttributes'] = array(
'href' => self::$currentIndex.'&amp;updateattribute&amp;token='.$this->token,
'desc' => $this->l('Add new Values'),
'desc' => $this->l('Add New Values'),
'class' => 'toolbar-new'
);
}
@@ -514,18 +514,18 @@ class AdminAttributesGroupsControllerCore extends AdminController
switch ($this->display)
{
case 'edit':
$bread_extended[] = $this->l('Edit new Attribute');
$bread_extended[] = $this->l('Edit New Attributes');
break;
case 'add':
$bread_extended[] = $this->l('Add new Attribute');
$bread_extended[] = $this->l('Add New Attributes');
break;
case 'editAttributes':
if ($this->id_attribute)
$bread_extended[] = $this->l('Edit Value');
else
$bread_extended[] = $this->l('Add new Value');
$bread_extended[] = $this->l('Add New Values');
break;
}
controllers/admin/AdminBackupController.php
+7 -7
View File
@@ -58,8 +58,8 @@ class AdminBackupControllerCore extends AdminController
'type' => 'bool'
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import:'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring the backed up data').
'title' => $this->l('Drop existing tables during import'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring data.').
'<br />(ie. "DROP TABLE IF EXISTS")',
'cast' => 'intval',
'type' => 'bool'
@@ -154,7 +154,7 @@ class AdminBackupControllerCore extends AdminController
// 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('The "Backups" directory located in the admin directory must be writeable (CHMOD 755 / 777)');
if ($this->display == 'add' && is_writable(_PS_ADMIN_DIR_.'/backups/'))
{
@@ -164,7 +164,7 @@ class AdminBackupControllerCore extends AdminController
$this->errors[] = $object->error;
else
$this->context->smarty->assign(array(
'conf' => $this->l('It appears that the Backup was successful, however, you must download and carefully verify the Backup file.'),
'conf' => $this->l('It appears the backup was successful, however you must download and carefully verify the backup file before proceeding. '),
'backup_url' => $object->getBackupURL(),
'backup_weight' => number_format((filesize($object->id) * 0.000001), 2, '.', '')
));
@@ -234,16 +234,16 @@ class AdminBackupControllerCore extends AdminController
$date = date('Y-m-d H:i:s', $timestamp);
$age = time() - $timestamp;
if ($age < 3600)
$age = '< 1 '.$this->l('hour');
$age = '< 1 '.$this->l('Hour');
else if ($age < 86400)
{
$age = floor($age / 3600);
$age = $age.' '.(($age == 1) ? $this->l('hour') : $this->l('hours'));
$age = $age.' '.(($age == 1) ? $this->l('Hour') : $this->l('Hours'));
}
else
{
$age = floor($age / 86400);
$age = $age.' '.(($age == 1) ? $this->l('day') : $this->l('days'));
$age = $age.' '.(($age == 1) ? $this->l('Day') : $this->l('Days'));
}
$size = filesize(_PS_ADMIN_DIR_.'/backups/'.$file);
$this->_list[] = array(
controllers/admin/AdminCarriersController.php
+26 -26
View File
@@ -43,7 +43,7 @@ class AdminCarriersControllerCore extends AdminController
$this->context = Context::getContext();
$this->bulk_actions = array(
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')),
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Are you sure that you want to delete the selected items?')),
'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection'))
);
@@ -162,24 +162,24 @@ class AdminCarriersControllerCore extends AdminController
'&nbsp;<b>'.$this->l('How do I create a new carrier?').'</b>
<br />
<ul>
<li>'.$this->l('Click "Add new."').'<br /></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 set a price range or a weight range for which the new carrier will be available.').' '.
$this->l('You need to set a price range -- or weight range -- for which the new carrier will be available.').' '.
$this->l('Under the "Shipping" menu, 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('Select the name of the carrier before defining the price or weight range.').' '.
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier can 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" menu.').'</li>
<li>'.
$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.').'
$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 and click "Save."').'</li>
<li>'.$this->l('For each zone, enter a price and then click "Save."').'</li>
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
</ul>'
);
@@ -196,7 +196,7 @@ class AdminCarriersControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Carriers'),
'title' => $this->l('Carriers:'),
'image' => '../img/admin/delivery.gif'
),
'input' => array(
@@ -209,14 +209,14 @@ class AdminCarriersControllerCore extends AdminController
'hint' => sprintf($this->l('Allowed characters: letters, spaces and %s'), '().-'),
'desc' => array(
$this->l('Carrier name displayed during checkout'),
$this->l('For in-store pickup, enter 0 to replace the carrier name with your 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 a 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',
@@ -226,7 +226,7 @@ class AdminCarriersControllerCore extends AdminController
'required' => true,
'size' => 41,
'maxlength' => 128,
'desc' => $this->l('Estimated delivery time, displayed during checkout')
'desc' => $this->l('Estimated delivery time will be displayed during checkout.')
),
array(
'type' => 'text',
@@ -234,14 +234,14 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'grade',
'required' => false,
'size' => 1,
'desc' => $this->l('"0" for a longest shipping delay, "9" for the shortest shipping delay.')
'desc' => $this->l('Enter "0" for a longest shipping delay, or "9" for the shortest shipping delay.')
),
array(
'type' => 'text',
'label' => $this->l('URL:'),
'name' => 'url',
'size' => 40,
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
'desc' => $this->l('Delivery tracking URL: Type \'@\' where the tracking number should appear. It will then be automatically replaced by the tracking number.')
),
array(
'type' => 'checkbox',
@@ -252,14 +252,14 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('The zones in which this carrier is to be used')
'desc' => $this->l('The zones in which this carrier will 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 for which you want to give access to this carrier')
'desc' => $this->l('Mark the groups that are allowed access to this carrier.')
),
array(
'type' => 'radio',
@@ -280,7 +280,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable carrier in the Front Office')
'desc' => $this->l('Enable the carrier in the Front Office')
),
array(
'type' => 'radio',
@@ -300,7 +300,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
)
),
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
'desc' => $this->l('Apply both regular shipping cost and product-specific shipping costs.')
),
array(
'type' => 'select',
@@ -318,7 +318,7 @@ class AdminCarriersControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Shipping & handling:'),
'label' => $this->l('Shipping and handling:'),
'name' => 'shipping_handling',
'required' => false,
'class' => 't',
@@ -335,7 +335,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Include the shipping & handling costs in carrier price')
'desc' => $this->l('Include the shipping and handling costs in the carrier price.')
),
array(
'type' => 'radio',
@@ -380,7 +380,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 occurs when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
),
array(
'type' => 'text',
@@ -388,7 +388,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_height',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -396,7 +396,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -404,7 +404,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum depth managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -412,7 +412,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'hidden',
@@ -443,7 +443,7 @@ class AdminCarriersControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -555,7 +555,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 one');
$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
controllers/admin/AdminCartRulesController.php
+1 -1
View File
@@ -541,7 +541,7 @@ class AdminCartRulesControllerCore extends AdminController
'show_toolbar' => true,
'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => $this->toolbar_scroll,
'title' => array($this->l('Payment'), $this->l('Cart Rules')),
'title' => array($this->l('Payment: '), $this->l('Cart Rules')),
'defaultDateFrom' => date('Y-m-d H:00:00'),
'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')),
'customerFilter' => $customer_filter,
controllers/admin/AdminCategoriesController.php
+12 -12
View File
@@ -232,7 +232,7 @@ class AdminCategoriesControllerCore extends AdminController
);
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
$this->toolbar_btn['import'] = array(
'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table,
@@ -257,7 +257,7 @@ class AdminCategoriesControllerCore extends AdminController
if ($this->display == 'view')
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;id_parent='.(int)Tools::getValue('id_category').'&amp;token='.$this->token,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
parent::initToolbar();
if ($this->_category->id == Category::getTopCategory()->id && isset($this->toolbar_btn['new']))
@@ -268,7 +268,7 @@ class AdminCategoriesControllerCore extends AdminController
$id_category = (Tools::isSubmit('id_category')) ? '&amp;id_parent='.(int)Tools::getValue('id_category') : '';
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token.$id_category,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
if (Tools::isSubmit('id_category'))
@@ -318,8 +318,8 @@ 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 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>');
$unidentified_group_information = sprintf($this->l('%s - All people without a valid 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 people who have 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, 'name' => $root_category->name);
@@ -367,7 +367,7 @@ class AdminCategoriesControllerCore extends AdminController
'values' => array(
'trads' => array(
'Root' => $root_category,
'selected' => $this->l('selected'),
'selected' => $this->l('Selected'),
'Collapse All' => $this->l('Collapse All'),
'Expand All' => $this->l('Expand All')
),
@@ -414,7 +414,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Image:'),
'name' => 'image',
'display_image' => true,
'desc' => $this->l('Upload category logo from your computer')
'desc' => $this->l('Upload a category logo from your computer.')
),
array(
'type' => 'text',
@@ -436,7 +436,7 @@ class AdminCategoriesControllerCore extends AdminController
'name' => 'meta_keywords',
'lang' => true,
'hint' => $this->l('Forbidden characters:').' <>;=#{}',
'desc' => $this->l('To add "tags" click in the field, write something, then press "Enter"')
'desc' => $this->l('To add "tags," click in the field, write something, and then press "Enter."')
),
array(
'type' => 'text',
@@ -444,7 +444,7 @@ class AdminCategoriesControllerCore extends AdminController
'name' => 'link_rewrite',
'lang' => true,
'required' => true,
'hint' => $this->l('Only letters and the minus (-) character are allowed')
'hint' => $this->l('Only letters and the minus (-) character are allowed.')
),
array(
'type' => 'group',
@@ -455,7 +455,7 @@ class AdminCategoriesControllerCore extends AdminController
'unidentified' => $unidentified_group_information,
'guest' => $guest_group_information,
'customer' => $default_group_information,
'desc' => $this->l('Mark all customer groups you want to give access to this category')
'desc' => $this->l('Mark all of the customer groups you;d like to have access to this category.')
)
),
'submit' => array(
@@ -540,10 +540,10 @@ class AdminCategoriesControllerCore extends AdminController
if ($id_category != $id_parent)
{
if (!Category::checkBeforeMove($id_category, $id_parent))
$this->errors[] = Tools::displayError($this->l('Category cannot be moved here'));
$this->errors[] = Tools::displayError($this->l('The category cannot be moved here.'));
}
else
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of itself.'));
$this->errors[] = Tools::displayError($this->l('The category cannot be a parent of itself.'));
}
$object = parent::processAdd();
controllers/admin/AdminCmsCategoriesController.php
+1 -1
View File
@@ -294,7 +294,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
'name' => 'link_rewrite',
'required' => true,
'lang' => true,
'hint' => $this->l('Only letters and the minus (-) character are allowed')
'hint' => $this->l('Only letters and the minus (-) character are allowed.')
),
),
'submit' => array(
controllers/admin/AdminCmsController.php
+1 -1
View File
@@ -123,7 +123,7 @@ class AdminCmsControllerCore extends AdminController
'lang' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'size' => 70,
'desc' => $this->l('To add "tags" click in the field, write something, then press "Enter"')
'desc' => $this->l('To add "tags" click in the field, write something, and then press "Enter."')
),
array(
'type' => 'text',
controllers/admin/AdminContactsController.php
+6 -6
View File
@@ -38,7 +38,7 @@ class AdminContactsControllerCore extends AdminController
$this->fields_list = array(
'id_contact' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Title'), 'width' => 130),
'email' => array('title' => $this->l('E-mail address'), 'width' => 130),
'email' => array('title' => $this->l('Email address'), 'width' => 130),
'description' => array('title' => $this->l('Description'), 'width' => 150),
);
@@ -64,11 +64,11 @@ class AdminContactsControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('E-mail address'),
'label' => $this->l('Email address'),
'name' => 'email',
'size' => 33,
'required' => false,
'desc' => $this->l('E-mails will be sent to this address'),
'desc' => $this->l('Emails will be sent to this address'),
),
array(
'type' => 'radio',
@@ -77,7 +77,7 @@ class AdminContactsControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('If enabled, all messages will be saved in the "Customer Service" page under the "Customer" menu'),
'desc' => $this->l('If enabled, all messages will be saved in the "Customer Service" page under the "Customer" menu.'),
'values' => array(
array(
'id' => 'customer_service_on',
@@ -99,11 +99,11 @@ class AdminContactsControllerCore extends AdminController
'lang' => true,
'cols' => 36,
'rows' => 5,
'desc' => $this->l('Additional information about this contact'),
'desc' => $this->l('Further information regarding this contact'),
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
controllers/admin/AdminCountriesController.php
+8 -8
View File
@@ -174,7 +174,7 @@ class AdminCountriesControllerCore extends AdminController
'maxlength' => 3,
'class' => 'uppercase',
'required' => true,
'desc' => $this->l('2- or 3-letter ISO code (e.g. US for United States)').'.
'desc' => $this->l('Two -- or three -- letter ISO code (e.g. U.S. 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>.'
@@ -212,11 +212,11 @@ class AdminCountriesControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('Geographical zone where country is located')
'desc' => $this->l('Geographical region')
),
array(
'type' => 'radio',
'label' => $this->l('Need zip code:'),
'label' => $this->l('Need zip/postal code'),
'name' => 'need_zip_code',
'required' => false,
'class' => 't',
@@ -236,11 +236,11 @@ class AdminCountriesControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Zip code format:'),
'label' => $this->l('Zip/post code format'),
'name' => 'zip_code_format',
'class' => 'uppercase',
'required' => true,
'desc' => $this->l('Zip Code format (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')
'desc' => $this->l('Zip Code format (L for a letter, N for a number and C for the ISO code). For example, NNNNN for the United States. No verification if undefined.')
),
array(
'type' => 'address_layout',
@@ -274,7 +274,7 @@ class AdminCountriesControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Contains states:'),
'label' => $this->l('Contains following states:'),
'name' => 'contains_states',
'required' => false,
'class' => 't',
@@ -293,7 +293,7 @@ class AdminCountriesControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Need Tax identification number?'),
'label' => $this->l('Do you need a tax identification number?'),
'name' => 'need_identification_number',
'required' => false,
'class' => 't',
@@ -342,7 +342,7 @@ class AdminCountriesControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
controllers/admin/AdminCurrenciesController.php
+4 -4
View File
@@ -62,7 +62,7 @@ class AdminCurrenciesControllerCore extends AdminController
'cron' => array(
'title' => $this->l('Automatically update currency rates'),
'image' => '../img/admin/tab-tools.gif',
'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 />
'info' => $this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is. You can place this URL in the crontab,or access it manually.').':<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>',
)
);
@@ -98,7 +98,7 @@ class AdminCurrenciesControllerCore extends AdminController
'size' => 30,
'maxlength' => 32,
'required' => true,
'hint' => $this->l('Only letters and the minus character are allowed')
'hint' => $this->l('Only letters and the minus character are allowed.')
),
array(
'type' => 'text',
@@ -138,7 +138,7 @@ class AdminCurrenciesControllerCore extends AdminController
),
array(
'type' => 'select',
'label' => $this->l('Formatting:'),
'label' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1 Euro) to this currency. For example, if the default currency is Euros and this currency is Dollars, type \'1.20\''),
'name' => 'format',
'size' => 3,
'maxlength' => 11,
@@ -231,7 +231,7 @@ class AdminCurrenciesControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
controllers/admin/AdminCustomerPreferencesController.php
+4 -4
View File
@@ -51,7 +51,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" registration option 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/her address later.'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',
@@ -67,14 +67,14 @@ class AdminCustomerPreferencesControllerCore extends AdminController
),
'PS_CART_FOLLOWING' => array(
'title' => $this->l('Cart re-display at login'),
'desc' => $this->l('After customer logs in, recall and display contents of his/her last shopping cart'),
'desc' => $this->l('After customer logs in, you can recall and display the content of his/her last shopping cart.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_PASSWD_TIME_FRONT' => array(
'title' => $this->l('Regenerate password'),
'desc' => $this->l('Security minimum time to wait to regenerate the password'),
'desc' => $this->l('Minimum time requirted to to regenerate a password.'),
'validation' => 'isUnsignedInt',
'cast' => 'intval',
'size' => 5,
@@ -83,7 +83,7 @@ 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 enabled, some B2B features are available.'),
'desc' => $this->l('Activate or deactivate B2B mode. When this option is enabled, B2B features will be made available.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/admin/AdminCustomerThreadsController.php
+19 -19
View File
@@ -66,7 +66,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'tmpTableFilter' => true,
),
'email' => array(
'title' => $this->l('E-mail'),
'title' => $this->l('Email:'),
'width' => 100,
'filter_key' => 'a!email',
),
@@ -130,13 +130,13 @@ class AdminCustomerThreadsControllerCore extends AdminController
'title' => $this->l('Contact options'),
'fields' => array(
'PS_CUSTOMER_SERVICE_FILE_UPLOAD' => array(
'title' => $this->l('Allow file upload'),
'desc' => $this->l('Allow customers to upload file using contact page'),
'title' => $this->l('Allow file uploading'),
'desc' => $this->l('Allow customers to upload files using the contact page.'),
'type' => 'bool'
),
'PS_CUSTOMER_SERVICE_SIGNATURE' => array(
'title' => $this->l('Default message'),
'desc' => $this->l('Please fill the message that appears by default when you answer a thread on the customer service page'),
'desc' => $this->l('Please fill out the message fields that appear by default when you answer a thread on the customer service page.'),
'type' => 'textareaLang',
'lang' => true,
'rows' => 10,
@@ -167,44 +167,44 @@ class AdminCustomerThreadsControllerCore extends AdminController
),
'PS_SAV_IMAP_PWD' => array(
'title' => $this->l('IMAP password'),
'desc' => $this->l('Password to use to connect IMAP server'),
'desc' => $this->l('Password used to connect IMAP server'),
'type' => 'text',
'size' => 40,
),
'PS_SAV_IMAP_DELETE_MSG' => array(
'title' => $this->l('Delete messages'),
'desc' => $this->l('Delete messages after sync. If you do not active this option, the sync will be longer'),
'desc' => $this->l('Delete messages after sync. If you do not active this option, the sync will take more time.'),
'type' => 'bool',
),
'PS_SAV_IMAP_OPT_NORSH' => array(
'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 sessions.'),
),
'PS_SAV_IMAP_OPT_SSL' => array(
'title' => $this->l('IMAP options').' (/ssl)',
'type' => 'bool',
'desc' => $this->l('Use the Secure Socket Layer to encrypt the session'),
'desc' => $this->l('Use the Secure Socket Layer to encrypt the session.'),
),
'PS_SAV_IMAP_OPT_VALIDATE-CERT' => array(
'title' => $this->l('IMAP options').' (/validate-cert)',
'type' => 'bool',
'desc' => $this->l('Validate certificates from TLS/SSL server'),
'desc' => $this->l('Validate certificates from the TLS/SSL server'),
),
'PS_SAV_IMAP_OPT_NOVALIDATE-CERT' => array(
'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'),
'desc' => $this->l('Do not validate certificates from the TLS/SSL server. This is only needed if a server uses self-signed certificates'),
),
'PS_SAV_IMAP_OPT_TLS' => array(
'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'),
'desc' => $this->l('Force use of start-TLS to encrypt the session, and reject connection to servers that do not support it.'),
),
'PS_SAV_IMAP_OPT_NOTLS' => array(
'title' => $this->l('IMAP options').' (/notls)',
'type' => 'bool',
'desc' => $this->l('Do not use 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.'),
),
),
'submit' => array('title' => $this->l('Save'), 'class' => 'button'),
@@ -478,40 +478,40 @@ 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('Reply 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('All 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='.(int)Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Mark 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='.(int)Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Mark 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(
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=1&id_customer_thread='.(int)Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Disable pending status')
'name' => $this->l('Disable pending status.')
);
if ($thread->status != 'pending2')
$actions['pending2'] = array(
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=4&id_customer_thread='.(int)Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Mark 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(
'href' => self::$currentIndex.'&viewcustomer_thread&setstatus=1&id_customer_thread='.(int)Tools::getValue('id_customer_thread').'&viewmsg&token='.$this->token,
'name' => $this->l('Disable pending status')
'name' => $this->l('Disable pending status.')
);
if ($thread->id_customer)
controllers/admin/AdminCustomersController.php
+12 -12
View File
@@ -45,7 +45,7 @@ class AdminCustomersControllerCore extends AdminController
$this->addRowAction('edit');
$this->addRowAction('view');
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Would you like to delete the selected items?')));
$this->context = Context::getContext();
@@ -93,11 +93,11 @@ class AdminCustomersControllerCore extends AdminController
'width' => 'auto'
),
'firstname' => array(
'title' => $this->l('First name'),
'title' => $this->l('First Name'),
'width' => 'auto'
),
'email' => array(
'title' => $this->l('E-mail address'),
'title' => $this->l('Email address'),
'width' => 140,
),
'age' => array(
@@ -174,7 +174,7 @@ class AdminCustomersControllerCore extends AdminController
));
if (!$this->can_add_customer && !$this->display)
$this->informations[] = $this->l('You have to select a shop if you want to create a customer');
$this->informations[] = $this->l('You have to select a shop if you want to create a customer.');
parent::initContent();
}
@@ -290,7 +290,7 @@ class AdminCustomersControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('E-mail address:'),
'label' => $this->l('Email address:'),
'name' => 'email',
'size' => 33,
'required' => true
@@ -301,7 +301,7 @@ class AdminCustomersControllerCore extends AdminController
'name' => 'passwd',
'size' => 33,
'required' => ($obj->id ? false : true),
'desc' => ($obj->id ? $this->l('Leave blank if no change') : $this->l('5 characters min., only letters, numbers, or').' -_')
'desc' => ($obj->id ? $this->l('Leave this field blank if there\'s no change') : $this->l('Minimum of five characters (only letters and numbers).').' -_')
),
array(
'type' => 'birthday',
@@ -332,7 +332,7 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Allow or disallow this customer to log in')
'desc' => $this->l('Enable or disable customer login')
),
array(
'type' => 'radio',
@@ -353,11 +353,11 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Customer will receive your newsletter via e-mail')
'desc' => $this->l('Customers will receive your newsletter via email.')
),
array(
'type' => 'radio',
'label' => $this->l('Opt-in:'),
'label' => $this->l('Opt in:'),
'name' => 'optin',
'required' => false,
'class' => 't',
@@ -374,7 +374,7 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Customer will receive your ads via e-mail')
'desc' => $this->l('Customer will receive your ads via email.')
),
)
);
@@ -397,7 +397,7 @@ class AdminCustomersControllerCore extends AdminController
'name' => 'groupBox',
'values' => $groups,
'required' => true,
'desc' => $this->l('Select all customer groups you would like to apply to this customer')
'desc' => $this->l('Select all the groups that you would like to apply to this customer.')
),
array(
'type' => 'select',
@@ -487,7 +487,7 @@ class AdminCustomersControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
controllers/admin/AdminEmailsController.php
+14 -14
View File
@@ -38,12 +38,12 @@ class AdminEmailsControllerCore extends AdminController
$this->fields_options = array(
'email' => array(
'title' => $this->l('E-mail'),
'title' => $this->l('Email:'),
'icon' => 'email',
'fields' => array(
'PS_MAIL_EMAIL_MESSAGE' => array(
'title' => $this->l('Send e-mail to'),
'desc' => $this->l('Where customers send messages from order page'),
'title' => $this->l('Send email to'),
'desc' => $this->l('Where customers send messages from the order page.'),
'validation' => 'isUnsignedId',
'type' => 'select',
'cast' => 'intval',
@@ -56,7 +56,7 @@ class AdminEmailsControllerCore extends AdminController
'type' => 'radio',
'required' => true,
'choices' => array(
1 => $this->l('Use PHP mail() function. Recommended; works in most cases'),
1 => $this->l('Use PHP mail() function. Recommended; works in most cases'),
2 => $this->l('Set my own SMTP parameters. For advanced users ONLY')
),
'js' => array(
@@ -66,8 +66,8 @@ class AdminEmailsControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_TYPE' => array('title' => '', 'validation' => 'isGenericName', 'type' => 'radio', 'required' => true, 'choices' => array(
Mail::TYPE_HTML => $this->l('Send e-mail as HTML'),
Mail::TYPE_TEXT => $this->l('Send e-mail as Text'),
Mail::TYPE_HTML => $this->l('Send email in HTML format. '),
Mail::TYPE_TEXT => $this->l('Send email in text format'),
Mail::TYPE_BOTH => $this->l('Both')
)
),
@@ -75,14 +75,14 @@ class AdminEmailsControllerCore extends AdminController
'submit' => array()
),
'smtp' => array(
'title' => $this->l('E-mail'),
'title' => $this->l('Email:'),
'icon' => 'email',
'top' => '<div id="smtp" style="display: '.((Configuration::get('PS_MAIL_METHOD') == 2) ? 'block' : 'none').';">',
'bottom' => '</div>',
'fields' => array(
'PS_MAIL_DOMAIN' => array(
'title' => $this->l('Mail domain name:'),
'desc' => $this->l('Fully qualified domain name (keep empty if you do not know)'),
'desc' => $this->l('Fully qualified domain name (keep this field empty if you don\'t know).'),
'empty' => true, 'validation' =>
'isUrl', 'size' => 30,
'type' => 'text',
@@ -98,7 +98,7 @@ class AdminEmailsControllerCore extends AdminController
),
'PS_MAIL_USER' => array(
'title' => $this->l('SMTP user:'),
'desc' => $this->l('Leave blank if not applicable'),
'desc' => $this->l('Leave blank if not applicable.'),
'validation' => 'isGenericName',
'size' => 30,
'type' => 'text',
@@ -106,7 +106,7 @@ class AdminEmailsControllerCore extends AdminController
),
'PS_MAIL_PASSWD' => array(
'title' => $this->l('SMTP password:'),
'desc' => $this->l('Leave blank if not applicable'),
'desc' => $this->l('Leave blank if not applicable.'),
'validation' => 'isAnything',
'size' => 30,
'type' => 'password',
@@ -148,17 +148,17 @@ class AdminEmailsControllerCore extends AdminController
'submit' => array()
),
'test' => array(
'title' => $this->l('Test your e-mail configuration'),
'title' => $this->l('Test your email configuration'),
'icon' => 'email',
'fields' => array(
'PS_SHOP_EMAIL' => array(
'title' => $this->l('Send a test e-mail to'),
'title' => $this->l('Send a test email to'),
'type' => 'text',
'size' => 40,
'id' => 'testEmail'
),
),
'bottom' => '<div class="margin-form"><input type="button" class="button" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an e-mail test').'" onclick="verifyMail();" /><br />
'bottom' => '<div class="margin-form"><input type="button" class="button" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
<p id="mailResultCheck" style="display:none;"></p></div>',
)
);
@@ -177,7 +177,7 @@ class AdminEmailsControllerCore extends AdminController
$this->toolbar_btn['back'] = array(
'href' => $back,
'desc' => $this->l('Back to dashboard')
'desc' => $this->l('Back to the dashboard')
);
$this->content .= $this->renderOptions();
controllers/admin/AdminEmployeesController.php
+14 -14
View File
@@ -72,9 +72,9 @@ class AdminEmployeesControllerCore extends AdminController
$this->fields_list = array(
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'lastname' => array('title' => $this->l('Last name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First name'), 'width' => 130),
'email' => array('title' => $this->l('E-mail address'), 'width' => 180),
'lastname' => array('title' => $this->l('Last Name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First Name'), 'width' => 130),
'email' => array('title' => $this->l('Email address'), 'width' => 180),
'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30),
);
@@ -85,7 +85,7 @@ class AdminEmployeesControllerCore extends AdminController
'fields' => array(
'PS_PASSWD_TIME_BACK' => array(
'title' => $this->l('Password regeneration'),
'desc' => $this->l('Security: minimum time to wait between two password changes'),
'desc' => $this->l('Security: Minimum time to wait between two password changes'),
'cast' => 'intval',
'size' => 5,
'type' => 'text',
@@ -93,8 +93,8 @@ class AdminEmployeesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_BO_ALLOW_EMPLOYEE_FORM_LANG' => array(
'title' => $this->l('Memorize language used in Admin panel forms'),
'desc' => $this->l('Allow employees to select a specific language for Admin panel forms'),
'title' => $this->l('Memorize the language used in Admin panel forms.'),
'desc' => $this->l('Allow employees to select a specific language for the Admin panel form.'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'value',
@@ -189,12 +189,12 @@ class AdminEmployeesControllerCore extends AdminController
'required' => true,
'size' => 33,
'desc' => ($obj->id ?
$this->l('Leave blank if you do not want to change your password') :
$this->l('Min. 8 characters; use only letters, numbers or').' -_')
$this->l('Leave this field blank if you do not want to change your password.') :
$this->l('Minimum of eight characters (use only letters and numbers)').' -_')
),
array(
'type' => 'text',
'label' => $this->l('E-mail address:'),
'label' => $this->l('Email address:'),
'name' => 'email',
'size' => 33,
'required' => true
@@ -205,7 +205,7 @@ class AdminEmployeesControllerCore extends AdminController
'name' => 'bo_color',
'class' => 'color mColorPickerInput',
'size' => 20,
'desc' => $this->l('Admin panel 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).').' "lightblue", "#CC6600")'
),
array(
'type' => 'default_tab',
@@ -216,7 +216,7 @@ 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.')
@@ -243,7 +243,7 @@ class AdminEmployeesControllerCore extends AdminController
'type' => 'radio',
'label' => $this->l('Show screencast at log in:'),
'name' => 'bo_show_screencast',
'desc' => $this->l('Display the welcome video in the Admin panel dashboard at log in'),
'desc' => $this->l('Display the welcome video in the Admin panel dashboard at log in.'),
'required' => false,
'class' => 't',
'is_bool' => true,
@@ -284,7 +284,7 @@ class AdminEmployeesControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Allow or disallow this employee to log into the Admin panel')
'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
@@ -324,7 +324,7 @@ class AdminEmployeesControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
controllers/admin/AdminFeaturesController.php
+4 -4
View File
@@ -77,12 +77,12 @@ class AdminFeaturesControllerCore extends AdminController
// Added specific button in toolbar
$this->toolbar_btn['newAttributes'] = array(
'href' => self::$currentIndex.'&amp;addfeature_value&amp;token='.$this->token,
'desc' => $this->l('Add new feature value')
'desc' => $this->l('Add new feature values')
);
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;addfeature&amp;token='.$this->token,
'desc' => $this->l('Add new feature')
'desc' => $this->l('Add a new feature')
);
return parent::renderList();
@@ -239,7 +239,7 @@ class AdminFeaturesControllerCore extends AdminController
$this->toolbar_btn['back'] = array(
'href' => $back,
'desc' => $this->l('Back to list')
'desc' => $this->l('Back to the list')
);
break;
@@ -353,7 +353,7 @@ class AdminFeaturesControllerCore extends AdminController
}
}
else
$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->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,
controllers/admin/AdminGendersController.php
+2 -2
View File
@@ -139,14 +139,14 @@ class AdminGendersControllerCore extends AdminController
'label' => $this->l('Image Width:'),
'name' => 'img_width',
'size' => 4,
'desc' => $this->l('Image width in pixels. Enter "0" to use original size')
'desc' => $this->l('Image width in pixels. Enter "0" to use the original size.')
),
array(
'type' => 'text',
'label' => $this->l('Image Height:'),
'name' => 'img_height',
'size' => 4,
'desc' => $this->l('Image height in pixels. Enter "0" to use original size')
'desc' => $this->l('Image height in pixels. Enter "0" to use the original size.')
)
),
'submit' => array(
controllers/admin/AdminGeolocationController.php
+5 -5
View File
@@ -53,16 +53,16 @@ class AdminGeolocationControllerCore extends AdminController
'title' => $this->l('Geolocation behavior for restricted countries'),
'type' => 'select',
'identifier' => 'key',
'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'))),
'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 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 cannot see your catalog')),
array('key' => _PS_GEOLOCATION_NO_ORDER_, 'name' => $this->l('Visitors can see your catalog but cannot place 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.')))
),
),
),
@@ -139,7 +139,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 extract it (using Winrar or Gzip) into the /tools/geoip/ directory'));
$this->l('and extract it (using Winrar or Gzip) into the /tools/geoip/ directory.'));
parent::initContent();
}
controllers/admin/AdminGroupsController.php
+7 -7
View File
@@ -105,7 +105,7 @@ class AdminGroupsControllerCore extends AdminController
$this->toolbar_btn['save-and-stay'] = array(
'short' => 'SaveAndStay',
'href' => '#',
'desc' => $this->l('Save then add a category reduction'),
'desc' => $this->l('Save, then add a category reduction'),
'force_desc' => true,
);
parent::initToolbar();
@@ -151,7 +151,7 @@ class AdminGroupsControllerCore extends AdminController
'id_gender' => array('title' => $this->l('Titles'), 'align' => 'center', 'width' => 50,'icon' => $genders_icon, 'list' => $genders),
'firstname' => array('title' => $this->l('Name'), 'align' => 'center'),
'lastname' => array('title' => $this->l('Name'), 'align' => 'center'),
'email' => array('title' => $this->l('E-mail address'), 'width' => 150, 'align' => 'center'),
'email' => array('title' => $this->l('Email address'), 'width' => 150, 'align' => 'center'),
'birthday' => array('title' => $this->l('Birth date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
'date_add' => array('title' => $this->l('Register date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
'orders' => array('title' => $this->l('Orders'), 'align' => 'center'),
@@ -183,7 +183,7 @@ class AdminGroupsControllerCore extends AdminController
'image' => '../img/admin/tab-groups.gif'
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
),
'input' => array(
@@ -201,7 +201,7 @@ 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 products for members of this customer group.')
'desc' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
),
array(
'type' => 'select',
@@ -242,7 +242,7 @@ class AdminGroupsControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Customers in this group can view price')
'desc' => $this->l('Customers in this group can view prices')
),
array(
'type' => 'group_discount_category',
@@ -492,7 +492,7 @@ class AdminGroupsControllerCore extends AdminController
'<b>'.$unidentified->name[$this->context->language->id].'</b>'
);
$guest_group_information = sprintf(
$this->l('%s - Customer who placed an order with the Guest Checkout.'),
$this->l('%s - Customer who placed an order through Guest Checkout.'),
'<b>'.$guest->name[$this->context->language->id].'</b>'
);
$default_group_information = sprintf(
@@ -500,7 +500,7 @@ class AdminGroupsControllerCore extends AdminController
'<b>'.$default->name[$this->context->language->id].'</b>'
);
$this->displayInformation($this->l('You have now three default customer groups.'));
$this->displayInformation($this->l('You now have three default customer groups.'));
$this->displayInformation($unidentified_group_information);
$this->displayInformation($guest_group_information);
$this->displayInformation($default_group_information);
controllers/admin/AdminHomeController.php
+7 -7
View File
@@ -170,10 +170,10 @@ 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 is different from the main shop domain name set in "Multistore" page under the "Advanced Parameters" menu:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
$this->displayWarning($this->l('You are currently connected under the following domain name:').' <span style="color: #CC0000;">'.$_SERVER['HTTP_HOST'].'</span><br />'.
$this->l('This is different from the main shop domain name set in the "Multistore" page under the "Advanced Parameters" menu:').' <span style="color: #CC0000;">'.$shop->domain.'</span><br />
<a href="index.php?controller=AdminMeta&token='.Tools::getAdminTokenLite('AdminMeta').'#conf_id_domain">'.
$this->l('Click here if you want to modify the main shop domain name').'</a>');
$this->l('Click here if you want to modify your main shop\'s domain name.').'</a>');
}
protected function getQuickLinks()
@@ -184,7 +184,7 @@ class AdminHomeControllerCore extends AdminController
if ($profile_access[(int)Tab::getIdFromClassName('AdminStats')]['view'])
$quick_links['first'] = array(
'href' => $this->context->link->getAdminLink('AdminStats').'&amp;module=statsbestproducts',
'title' => $this->l('Products sold recently'),
'title' => $this->l('Recently sold products.'),
'description' => $this->l('Create a new category and organize your catalog.'),
);
@@ -219,7 +219,7 @@ class AdminHomeControllerCore extends AdminController
if ($profile_access[(int)Tab::getIdFromClassName('AdminCartRules')]['add'])
$quick_links['sixth'] = array(
'href' => $this->context->link->getAdminLink('AdminCartRules').'&amp;addcart_rule',
'title' => $this->l('New Price Rule for cart'),
'title' => $this->l('New price rule for cart'),
'description' => $this->l('Add new cart rule.'),
);
@@ -234,7 +234,7 @@ class AdminHomeControllerCore extends AdminController
$quick_links['eighth'] = array(
'href' => $this->context->link->getAdminLink('AdminCarts').'&amp;id_cart',
'title' => $this->l('Abandoned Carts'),
'description' => $this->l('View your customer carts.'),
'description' => $this->l('View your customer\'s carts.'),
);
return $quick_links;
}
@@ -457,7 +457,7 @@ class AdminHomeControllerCore extends AdminController
if (Configuration::updateValue('PS_HIDE_OPTIMIZATION_TIPS', 1))
{
$result['result'] = 'ok';
$result['msg'] = $this->l('Optimization Tips will be hidden by default');
$result['msg'] = $this->l('Optimization Tips will be hidden by default.');
}
else
{
controllers/admin/AdminImagesController.php
+26 -26
View File
@@ -43,17 +43,17 @@ class AdminImagesControllerCore extends AdminController
'name' => array('title' => $this->l('Name'), 'width' => 300),
'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
'products' => array('title' => $this->l('Products'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'categories' => array('title' => $this->l('Categories'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'manufacturers' => array('title' => $this->l('Manufacturers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'suppliers' => array('title' => $this->l('Suppliers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'products' => array('title' => $this->l('Products:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'categories' => array('title' => $this->l('Categories:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'manufacturers' => array('title' => $this->l('Manufacturers:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'suppliers' => array('title' => $this->l('Suppliers:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'scenes' => array('title' => $this->l('Scenes'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'stores' => array('title' => $this->l('Stores'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
);
$this->fields_options = array(
'images' => array(
'title' => $this->l('Images'),
'title' => $this->l('images'),
'icon' => 'tab-orders',
'top' => '',
'bottom' => '',
@@ -65,11 +65,11 @@ class AdminImagesControllerCore extends AdminController
'show' => true,
'required' => true,
'type' => 'radio',
'choices' => array('jpg' => $this->l('Use JPEG'), 'png' => $this->l('Use PNG only if the base image is in PNG format'), 'png_all' => $this->l('Use PNG for all images'))
'choices' => array('jpg' => $this->l('Use JPEG'), 'png' => $this->l('Use PNG only if the base image is in PNG format.'), 'png_all' => $this->l('Use PNG for all images'))
),
'PS_JPEG_QUALITY' => array(
'title' => $this->l('JPEG quality'),
'desc' => $this->l('Ranges from 0 (worst quality, smallest file) to 100 (best quality, biggest file)'),
'desc' => $this->l('Ranges from 0 (worst quality, smallest file) to 100 (best quality, biggest file).'),
'validation' => 'isUnsignedId',
'required' => true,
'cast' => 'intval',
@@ -77,7 +77,7 @@ class AdminImagesControllerCore extends AdminController
),
'PS_PNG_QUALITY' => array(
'title' => $this->l('PNG quality'),
'desc' => $this->l('Ranges from 9 (worst quality, smallest file) to 0 (best quality, biggest file)'),
'desc' => $this->l('Ranges from 9 (worst quality, smallest file) to 0 (best quality, biggest file).'),
'validation' => 'isUnsignedId',
'required' => true,
'cast' => 'intval',
@@ -114,7 +114,7 @@ class AdminImagesControllerCore extends AdminController
),
'PS_PRODUCT_PICTURE_MAX_SIZE' => array(
'title' => $this->l('Maximum size of product pictures'),
'desc' => $this->l('The maximum size of pictures uploadable by customers (in Bytes)'),
'desc' => $this->l('The maximum size of pictures uploadable by customers (in Bytes).'),
'validation' => 'isUnsignedInt',
'required' => true,
'cast' => 'intval',
@@ -124,7 +124,7 @@ class AdminImagesControllerCore extends AdminController
),
'PS_PRODUCT_PICTURE_WIDTH' => array(
'title' => $this->l('Product picture width'),
'desc' => $this->l('The maximum width of pictures uploadable by customers'),
'desc' => $this->l('The maximum width of pictures uploadable by customers.'),
'validation' => 'isUnsignedInt',
'required' => true,
'cast' => 'intval',
@@ -134,7 +134,7 @@ class AdminImagesControllerCore extends AdminController
),
'PS_PRODUCT_PICTURE_HEIGHT' => array(
'title' => $this->l('Product picture height'),
'desc' => $this->l('The maximum height of pictures uploadable by customers'),
'desc' => $this->l('The maximum height of pictures uploadable by customers.'),
'validation' => 'isUnsignedInt',
'required' => true,
'cast' => 'intval',
@@ -143,8 +143,8 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_LEGACY_IMAGES' => array(
'title' => $this->l('Use the legacy image filesystem'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in "Images" page under the "Preferences" menu'),
'title' => $this->l('Use the legacy image filesystem.'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in "Images" page under the "Preferences" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,
@@ -152,13 +152,13 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
),
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
'submit' => array('title' => $this->l('Save '), 'class' => 'button'),
),
);
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Images'),
'title' => $this->l('images'),
'image' => '../img/admin/picture.gif'
),
'input' => array(
@@ -215,7 +215,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to Category images'),
'desc' => $this->l('This type will be applied to Category images.'),
'values' => array(
array(
'id' => 'categories_on',
@@ -236,7 +236,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to Manufacturer images'),
'desc' => $this->l('This type will be applied to Manufacturer images.'),
'values' => array(
array(
'id' => 'manufacturers_on',
@@ -257,7 +257,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be used for Supplier images'),
'desc' => $this->l('This type will be used for Supplier images.'),
'values' => array(
array(
'id' => 'suppliers_on',
@@ -278,7 +278,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be used for Scene images'),
'desc' => $this->l('This type will be used for Scene images.'),
'values' => array(
array(
'id' => 'scenes_on',
@@ -299,7 +299,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be used for Store images'),
'desc' => $this->l('This type will be used for Store images.'),
'values' => array(
array(
'id' => 'stores_on',
@@ -315,7 +315,7 @@ class AdminImagesControllerCore extends AdminController
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
@@ -329,7 +329,7 @@ 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. This is likely caused by unused demonstration images. Please make sure that the folder ').
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. This is likely caused by unused demonstration images. Please make sure that the folder').
_PS_PROD_IMG_DIR_.'duplicates/'.
$this->l('only contains demonstration images, and then delete this folder.');
}
@@ -396,11 +396,11 @@ class AdminImagesControllerCore extends AdminController
public function initRegenerate()
{
$types = array(
'categories' => $this->l('Categories'),
'manufacturers' => $this->l('Manufacturers'),
'suppliers' => $this->l('Suppliers'),
'categories' => $this->l('Categories:'),
'manufacturers' => $this->l('Manufacturers:'),
'suppliers' => $this->l('Suppliers:'),
'scenes' => $this->l('Scenes'),
'products' => $this->l('Products'),
'products' => $this->l('Products:'),
'stores' => $this->l('Stores')
);
controllers/admin/AdminImportController.php
+32 -32
View File
@@ -81,13 +81,13 @@ class AdminImportControllerCore extends AdminController
public function __construct()
{
$this->entities = array(
$this->l('Categories'),
$this->l('Products'),
$this->l('Categories:'),
$this->l('Products:'),
$this->l('Combinations'),
$this->l('Customers'),
$this->l('Addresses'),
$this->l('Manufacturers'),
$this->l('Suppliers'),
$this->l('Manufacturers:'),
$this->l('Suppliers:'),
);
// @since 1.5.0
@@ -142,7 +142,7 @@ class AdminImportControllerCore extends AdminController
),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
)
);
@@ -161,7 +161,7 @@ class AdminImportControllerCore extends AdminController
);
break;
case $this->entities[$this->l('Categories')]:
case $this->entities[$this->l('Categories:')]:
$this->available_fields = array(
'no' => array('label' => $this->l('Ignore this column')),
'id' => array('label' => $this->l('ID')),
@@ -170,7 +170,7 @@ class AdminImportControllerCore extends AdminController
'parent' => array('label' => $this->l('Parent category')),
'is_root_category' => array(
'label' => $this->l('Root category (0/1)'),
'help' => $this->l('A category root is where a category tree can begin. This is used with multistore')
'help' => $this->l('A category root is where a category tree can begin. This is used with multistore.')
),
'description' => array('label' => $this->l('Description')),
'meta_title' => array('label' => $this->l('Meta-title')),
@@ -180,7 +180,7 @@ class AdminImportControllerCore extends AdminController
'image' => array('label' => $this->l('Image URL')),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
),
);
@@ -191,7 +191,7 @@ class AdminImportControllerCore extends AdminController
);
break;
case $this->entities[$this->l('Products')]:
case $this->entities[$this->l('Products:')]:
self::$validators['image'] = array(
'AdminImportController',
'split'
@@ -203,8 +203,8 @@ class AdminImportControllerCore extends AdminController
'active' => array('label' => $this->l('Active (0/1)')),
'name' => array('label' => $this->l('Name *')),
'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.')),
'price_tex' => array('label' => $this->l('Price tax excluded')),
'price_tin' => array('label' => $this->l('Price tax included')),
'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)')),
@@ -242,7 +242,7 @@ class AdminImportControllerCore extends AdminController
'condition' => array('label' => $this->l('Condition')),
'shop' => array(
'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
)
);
@@ -271,16 +271,16 @@ class AdminImportControllerCore extends AdminController
'id' => array('label' => $this->l('ID')),
'active' => array('label' => $this->l('Active (0/1)')),
'id_gender' => array('label' => $this->l('Titles ID (Mr = 1, Ms = 2, else 0)')),
'email' => array('label' => $this->l('E-mail *')),
'email' => array('label' => $this->l('Email *')),
'passwd' => array('label' => $this->l('Password *')),
'birthday' => array('label' => $this->l('Birthday (yyyy-mm-dd)')),
'lastname' => array('label' => $this->l('Lastname *')),
'firstname' => array('label' => $this->l('Firstname *')),
'lastname' => array('label' => $this->l('Last Name *')),
'firstname' => array('label' => $this->l('First Name *')),
'newsletter' => array('label' => $this->l('Newsletter (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 the Multistore tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
),
);
@@ -307,13 +307,13 @@ class AdminImportControllerCore extends AdminController
'id' => array('label' => $this->l('ID')),
'alias' => array('label' => $this->l('Alias *')),
'active' => array('label' => $this->l('Active (0/1)')),
'customer_email' => array('label' => $this->l('Customer e-mail')),
'id_customer' => array('label' => $this->l('Customer ID')),
'customer_email' => array('label' => $this->l('Customer email')),
'id_customer' => array('label' => $this->l('Customer ID:')),
'manufacturer' => array('label' => $this->l('Manufacturer')),
'supplier' => array('label' => $this->l('Supplier')),
'company' => array('label' => $this->l('Company')),
'lastname' => array('label' => $this->l('Lastname *')),
'firstname' => array('label' => $this->l('Firstname *')),
'lastname' => array('label' => $this->l('Last Name *')),
'firstname' => array('label' => $this->l('First Name *')),
'address1' => array('label' => $this->l('Address 1 *')),
'address2' => array('label' => $this->l('Address 2')),
'postcode' => array('label' => $this->l('Postcode*/ Zipcode*')),
@@ -332,8 +332,8 @@ class AdminImportControllerCore extends AdminController
);
break;
case $this->entities[$this->l('Manufacturers')]:
case $this->entities[$this->l('Suppliers')]:
case $this->entities[$this->l('Manufacturers:')]:
case $this->entities[$this->l('Suppliers:')]:
//Overwrite validators AS name is not MultiLangField
self::$validators = array(
'description' => array('AdminImportController', 'createMultiLangField'),
@@ -355,7 +355,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 the Multistore tool. If you leave this field empty, default shop will be used'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
),
);
@@ -439,7 +439,7 @@ class AdminImportControllerCore extends AdminController
public function renderForm()
{
if (!is_writable(_PS_ADMIN_DIR_.'/import/'))
$this->displayWarning($this->l('directory import on admin directory must be writable (CHMOD 755 / 777)'));
$this->displayWarning($this->l('Directory import on admin directory must be writable (CHMOD 755 / 777)'));
if (isset($this->warnings) && count($this->warnings))
{
@@ -2537,7 +2537,7 @@ class AdminImportControllerCore extends AdminController
{
switch ((int)$case)
{
case $this->entities[$this->l('Categories')]:
case $this->entities[$this->l('Categories:')]:
Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'category`
WHERE id_category NOT IN ('.(int)Configuration::get('PS_HOME_CATEGORY').
@@ -2555,7 +2555,7 @@ class AdminImportControllerCore extends AdminController
if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
unlink(_PS_CAT_IMG_DIR_.$d);
break;
case $this->entities[$this->l('Products')]:
case $this->entities[$this->l('Products:')]:
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_shop');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product');
@@ -2615,7 +2615,7 @@ class AdminImportControllerCore extends AdminController
case $this->entities[$this->l('Addresses')]:
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address');
break;
case $this->entities[$this->l('Manufacturers')]:
case $this->entities[$this->l('Manufacturers:')]:
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_shop');
@@ -2623,7 +2623,7 @@ class AdminImportControllerCore extends AdminController
if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
unlink(_PS_MANU_IMG_DIR_.$d);
break;
case $this->entities[$this->l('Suppliers')]:
case $this->entities[$this->l('Suppliers:')]:
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_shop');
@@ -2690,10 +2690,10 @@ class AdminImportControllerCore extends AdminController
switch ((int)Tools::getValue('entity'))
{
case $this->entities[$this->l('Categories')]:
case $this->entities[$this->l('Categories:')]:
$this->categoryImport();
break;
case $this->entities[$this->l('Products')]:
case $this->entities[$this->l('Products:')]:
$this->productImport();
break;
case $this->entities[$this->l('Customers')]:
@@ -2705,10 +2705,10 @@ class AdminImportControllerCore extends AdminController
case $this->entities[$this->l('Combinations')]:
$this->attributeImport();
break;
case $this->entities[$this->l('Manufacturers')]:
case $this->entities[$this->l('Manufacturers:')]:
$this->manufacturerImport();
break;
case $this->entities[$this->l('Suppliers')]:
case $this->entities[$this->l('Suppliers:')]:
$this->supplierImport();
break;
// @since 1.5.0
controllers/admin/AdminInformationController.php
+15 -15
View File
@@ -89,23 +89,23 @@ class AdminInformationControllerCore extends AdminController
$tests_errors = array(
'phpversion' => $this->l('Update your PHP version'),
'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'),
'log_dir' => $this->l('Set write permissions for "log" 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'),
'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 the "config" folder.'),
'cache_dir' => $this->l('Set write permissions for the "cache" folder.'),
'sitemap' => $this->l('Set write permissions for the "sitemap.xml" file.'),
'img_dir' => $this->l('Set write permissions for the "img" folder and subfolders.'),
'log_dir' => $this->l('Set write permissions for the "log" folder and subfolders.'),
'mails_dir' => $this->l('Set write permissions for the "mails" folder and subfolders.'),
'module_dir' => $this->l('Set write permissions for the "modules" folder and subfolders.'),
'theme_lang_dir' => $this->l('Set the write permissions for the "themes')._THEME_NAME_.$this->l('/lang/" folder and subfolders, recursively.'),
'translations_dir' => $this->l('Set write permissions for the "translations" folder and subfolders.'),
'customizable_products_dir' => $this->l('Set write permissions for the "upload" folder and subfolders.'),
'virtual_products_dir' => $this->l('Set write permissions for the "download" folder and subfolders.'),
'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')
'gz' => $this->l('Enable GZIP compression on your server.')
);
$params_required_results = ConfigurationTest::check($tests);
controllers/admin/AdminInvoicesController.php
+9 -9
View File
@@ -38,7 +38,7 @@ class AdminInvoicesControllerCore extends AdminController
'fields' => array(
'PS_INVOICE' => array(
'title' => $this->l('Enable invoices:'),
'desc' => $this->l('If enabled, your customers will be able to receive an invoice for their purchases'),
'desc' => $this->l('If enabled, your customers will be able to receive an invoice for their purchase(s).'),
'cast' => 'intval',
'type' => 'bool'
),
@@ -50,7 +50,7 @@ class AdminInvoicesControllerCore extends AdminController
),
'PS_INVOICE_START_NUMBER' => array(
'title' => $this->l('Invoice number:'),
'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').',
'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number.').(Order::getLastInvoiceNumber() + 1).').',
'size' => 6,
'type' => 'text',
'cast' => 'intval'
@@ -144,11 +144,11 @@ class AdminInvoicesControllerCore extends AdminController
'id' => 'id_order_state',
'name' => 'name'
),
'desc' => $this->l('You can also export orders which have not been charged yet').' (<img src="../img/admin/charged_ko.gif" alt="" />).'
'desc' => $this->l('You can also export orders which have not been charged yet.').' (<img src="../img/admin/charged_ko.gif" alt="" />).'
)
),
'submit' => array(
'title' => $this->l('Generate PDF file by status'),
'title' => $this->l('Generate PDF file by status.'),
'class' => 'button',
'id' => 'submitPrint2'
)
@@ -206,7 +206,7 @@ class AdminInvoicesControllerCore extends AdminController
$this->toolbar_btn['save-status'] = array(
'href' => '#',
'desc' => $this->l('Generate PDF file by status')
'desc' => $this->l('Generate PDF file by status.')
);
}
@@ -225,20 +225,20 @@ class AdminInvoicesControllerCore extends AdminController
if (count(OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
Tools::redirectAdmin($this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicesPDF&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')));
$this->errors[] = $this->l('No invoice found for this period');
$this->errors[] = $this->l('No invoice has been found for this period.');
}
}
else if (Tools::isSubmit('submitAddinvoice_status'))
{
if (!is_array($status_array = Tools::getValue('id_order_state')) || !count($status_array))
$this->errors[] = $this->l('You must select at least one order status');
$this->errors[] = $this->l('You must select at least one order status.');
else
{
foreach ($status_array as $id_order_state)
if (count(OrderInvoice::getByStatus((int)$id_order_state)))
Tools::redirectAdmin($this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicesPDF2&id_order_state='.implode('-', $status_array));
$this->errors[] = $this->l('No invoice found for this status');
$this->errors[] = $this->l('No invoice has been found for this status.');
}
}
else
@@ -248,7 +248,7 @@ class AdminInvoicesControllerCore extends AdminController
public function beforeUpdateOptions()
{
if ((int)Tools::getValue('PS_INVOICE_START_NUMBER') != 0 && (int)Tools::getValue('PS_INVOICE_START_NUMBER') <= Order::getLastInvoiceNumber())
$this->errors[] = $this->l('Invalid invoice number (must be > ').Order::getLastInvoiceNumber().')';
$this->errors[] = $this->l('Invalid invoice number.').Order::getLastInvoiceNumber().')';
}
protected function getInvoicesModels()
controllers/admin/AdminLanguagesController.php
+14 -14
View File
@@ -93,7 +93,7 @@ class AdminLanguagesControllerCore extends AdminController
'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection'))
);
$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 proceed?');
parent::__construct();
}
@@ -135,7 +135,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('Two-letter ISO code (e.g. FR, EN, DE)')
),
array(
'type' => 'text',
@@ -144,7 +144,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',
@@ -152,7 +152,7 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_lite',
'required' => true,
'size' => 15,
'desc' => $this->l('Short date format (e.g. Y-m-d, d/m/Y)')
'desc' => $this->l('Short date format (e.g. YY-MM-DD)')
),
array(
'type' => 'text',
@@ -160,20 +160,20 @@ class AdminLanguagesControllerCore extends AdminController
'name' => 'date_format_full',
'required' => true,
'size' => 25,
'desc' => $this->l('Full date format (e.g., Y-m-d H:i:s, d/m/Y H:i)')
'desc' => $this->l('Full date format (e.g., YYYY-MM-DD)')
),
array(
'type' => 'file',
'label' => $this->l('Flag:'),
'name' => 'flag',
'required' => true,
'desc' => $this->l('Upload country flag from your computer')
'desc' => $this->l('Upload the country flag from your computer')
),
array(
'type' => 'file',
'label' => $this->l('"No-picture" image:'),
'name' => 'no-picture',
'desc' => $this->l('Image displayed when "no picture found"')
'desc' => $this->l('Image is displayed when "no picture is found"')
),
array(
'type' => 'radio',
@@ -216,12 +216,12 @@ class AdminLanguagesControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Allow or disallow this language to be selected by the customer')
'desc' => $this->l('Activate this language')
),
array(
'type' => 'special',
'name' => 'resultCheckLangPack',
'text' => $this->l('Check if a language pack is available for this ISO code...'),
'text' => $this->l('Check to see if a language pack is available for this ISO code.'),
'img' => 'ajax-loader.gif'
)
)
@@ -237,7 +237,7 @@ class AdminLanguagesControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -286,7 +286,7 @@ class AdminLanguagesControllerCore extends AdminController
if (Validate::isLoadedObject($object = $this->loadObject()) && isset($this->fieldImageSettings))
{
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())
@@ -308,9 +308,9 @@ 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');
$this->errors[] = $this->l('You cannot delete the language currently in use. Please change languages before deleting.');
else
{
foreach ($_POST[$this->table.'Box'] as $language)
@@ -497,7 +497,7 @@ class AdminLanguagesControllerCore extends AdminController
else
{
$this->status = 'error';
$this->errors[] = $this->l('wrong ISO code or language pack unavailable');
$this->errors[] = $this->l('Wrong ISO code, or the selectec language pack is unavailable.');
}
}
else
controllers/admin/AdminLocalizationController.php
+4 -4
View File
@@ -221,12 +221,12 @@ class AdminLocalizationControllerCore extends AdminController
array(
'id' => 'taxes',
'val' => 'taxes',
'name' => $this->l('Taxes')
'name' => $this->l('Taxes:')
),
array(
'id' => 'currencies',
'val' => 'currencies',
'name' => $this->l('Currencies')
'name' => $this->l('Currencies:')
),
array(
'id' => 'languages',
@@ -243,7 +243,7 @@ class AdminLocalizationControllerCore extends AdminController
$this->fields_form = array(
'tinymce' => true,
'legend' => array(
'title' => $this->l('Import localization pack'),
'title' => $this->l('Import a localization pack'),
'image' => '../img/admin/localization.gif'
),
'input' => array(
@@ -270,7 +270,7 @@ class AdminLocalizationControllerCore extends AdminController
)
),
'submit' => array(
'title' => $this->l(' Import '),
'title' => $this->l('Import '),
'class' => 'button',
'name' => 'submitLocalizationPack'
)
controllers/admin/AdminLoginController.php
+1 -1
View File
@@ -224,7 +224,7 @@ class AdminLoginControllerCore extends AdminController
else
die(Tools::jsonEncode(array(
'hasErrors' => false,
'confirm' => $this->l('Your password has been e-mailed to you', 'AdminTab', false, false)
'confirm' => $this->l('Your password has been emailed to you.', 'AdminTab', false, false)
)));
}
else
controllers/admin/AdminLogsController.php
+2 -2
View File
@@ -48,11 +48,11 @@ class AdminLogsControllerCore extends AdminController
$this->fields_options = array(
'general' => array(
'title' => $this->l('Logs by e-mail'),
'title' => $this->l('Logs by email'),
'fields' => array(
'PS_LOGS_BY_EMAIL' => array(
'title' => $this->l('Minimum severity level'),
'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.'),
'desc' => $this->l('Enter "5" if you do not want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
'cast' => 'intval',
'type' => 'text',
'size' => 5
controllers/admin/AdminMaintenanceController.php
+1 -1
View File
@@ -40,7 +40,7 @@ class AdminMaintenanceControllerCore extends AdminController
'fields' => array(
'PS_SHOP_ENABLE' => array(
'title' => $this->l('Enable Shop'),
'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'),
'desc' => $this->l('Activate or deactivate your shop (It is a good idea to deactivate your shop while you perform maintenance. Please note that the webservice will not be disabled).'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/admin/AdminManufacturersController.php
+8 -8
View File
@@ -69,7 +69,7 @@ class AdminManufacturersControllerCore extends AdminController
'havingFilter' => true
),
'products' => array(
'title' => $this->l('Products'),
'title' => $this->l('Products:'),
'havingFilter' => true,
'width' => 20,
'align' => 'center',
@@ -164,7 +164,7 @@ class AdminManufacturersControllerCore extends AdminController
'filter_key' => 'a!name'
),
'postcode' => array(
'title' => $this->l('Postal Code/Zip Code'),
'title' => $this->l('Zip Code/Postal Code'),
'align' => 'right',
'width' => 50
),
@@ -232,7 +232,7 @@ class AdminManufacturersControllerCore extends AdminController
$this->fields_form = array(
'tinymce' => true,
'legend' => array(
'title' => $this->l('Manufacturers'),
'title' => $this->l('Manufacturers:'),
'image' => '../img/admin/manufacturers.gif'
),
'input' => array(
@@ -269,7 +269,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Logo:'),
'name' => 'logo',
'display_image' => true,
'desc' => $this->l('Upload manufacturer logo from your computer')
'desc' => $this->l('Upload a manufacturer logo from your computer.')
),
array(
'type' => 'text',
@@ -291,7 +291,7 @@ class AdminManufacturersControllerCore extends AdminController
'name' => 'meta_keywords',
'lang' => true,
'hint' => $this->l('Forbidden characters:').' <>;=#{}',
'desc' => $this->l('To add "tags" click in the field, write something, then press "Enter"')
'desc' => $this->l('To add "tags," click inside the field, write something, and then press "Enter."')
),
array(
'type' => 'radio',
@@ -329,7 +329,7 @@ class AdminManufacturersControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -437,7 +437,7 @@ class AdminManufacturersControllerCore extends AdminController
);
$form['input'][] = array(
'type' => 'text',
'label' => $this->l('Postcode / Zip Code:'),
'label' => $this->l('Zip Code/Postal Code'),
'name' => 'postcode',
'size' => 33,
'required' => false,
@@ -496,7 +496,7 @@ class AdminManufacturersControllerCore extends AdminController
'hint' => $this->l('Forbidden characters:').' <>;=#{}'
);
$form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
controllers/admin/AdminMetaController.php
+13 -13
View File
@@ -58,15 +58,15 @@ class AdminMetaControllerCore extends AdminController
$general_fields = array(
'PS_REWRITING_SETTINGS' => array(
'title' => $this->l('Friendly URL'),
'desc' => ($mod_rewrite ? $this->l('Enable only if your server allows URL rewriting (recommended)') : ''),
'desc' => ($mod_rewrite ? $this->l('Enable only if your server allows URL rewriting (recommended).') : ''),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'rewriting_settings',
'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 the 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 URL rewriting on some pages.'),
'desc' => $this->l('Enable this option only if you have problems with URL rewriting.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -85,22 +85,22 @@ 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 blank .htaccess in your root directory');
$url_description .= '<br />- '.$this->l('give it write permissions (CHMOD 666 on Unix system)');
$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 robots.txt file MUST be in your website\'s root directory and nowhere else (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 the 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 blank robots.txt file in your root directory');
$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(
@@ -122,7 +122,7 @@ class AdminMetaControllerCore extends AdminController
$this->url = ShopUrl::getShopUrls($this->context->shop->id)->where('main', '=', 1)->getFirst();
if ($this->url)
{
$shop_url_options['description'] = $this->l('You can set here the URL for your shop. If you migrate your shop to a new URL, remember to change the values bellow.');
$shop_url_options['description'] = $this->l('Here you can set the URL for your shop. If you migrate your shop to a new URL, remember to change the values bellow.');
$shop_url_options['fields'] = array(
'domain' => array(
'title' => $this->l('Shop domain'),
@@ -149,7 +149,7 @@ class AdminMetaControllerCore extends AdminController
}
}
else
$shop_url_options['description'] = $this->l('Multistore option is enabled, if you want to change the URL of your shop you have to go to "Multistore" page under the "Advanced Parameters" menu.');
$shop_url_options['description'] = $this->l('The multistore option is enabled. If you want to change the URL of your shop, you must go to the "Multistore" page under the "Advanced Parameters" menu.');
// List of options
$this->fields_options = array(
@@ -167,7 +167,7 @@ class AdminMetaControllerCore extends AdminController
{
$this->fields_options['routes'] = array(
'title' => $this->l('Schema of URLs'),
'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.'),
'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 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 the URL if the meta title is set. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
'fields' => array()
);
$this->addAllRouteFields();
@@ -284,7 +284,7 @@ class AdminMetaControllerCore extends AdminController
'name' => 'keywords',
'lang' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'desc' => $this->l('List of keywords for search engines').' '.$this->l('To add "tags" click in the field, write something, then press "Enter"'),
'desc' => $this->l('List of keywords for search engines').' '.$this->l('To add "tags," click in the field, write something, and then press "Enter."'),
'size' => 50
),
array(
controllers/admin/AdminModulesController.php
+11 -11
View File
@@ -74,24 +74,24 @@ class AdminModulesControllerCore extends AdminController
// Set the modules categories
$this->list_modules_categories['administration']['name'] = $this->l('Administration');
$this->list_modules_categories['advertising_marketing']['name'] = $this->l('Advertising & Marketing');
$this->list_modules_categories['analytics_stats']['name'] = $this->l('Analytics & Stats');
$this->list_modules_categories['billing_invoicing']['name'] = $this->l('Billing & Invoicing');
$this->list_modules_categories['advertising_marketing']['name'] = $this->l('Advertising and Marketing');
$this->list_modules_categories['analytics_stats']['name'] = $this->l('Analytics and Stats');
$this->list_modules_categories['billing_invoicing']['name'] = $this->l('Billing and Invoicing');
$this->list_modules_categories['checkout']['name'] = $this->l('Checkout');
$this->list_modules_categories['content_management']['name'] = $this->l('Content Management');
$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('Internationalization & Localization');
$this->list_modules_categories['i18n_localization']['name'] = $this->l('Internationalization and 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');
$this->list_modules_categories['payments_gateways']['name'] = $this->l('Payments and Gateways');
$this->list_modules_categories['payment_security']['name'] = $this->l('Payment Security');
$this->list_modules_categories['pricing_promotion']['name'] = $this->l('Pricing & Promotion');
$this->list_modules_categories['pricing_promotion']['name'] = $this->l('Pricing and Promotion');
$this->list_modules_categories['quick_bulk_update']['name'] = $this->l('Quick / Bulk update');
$this->list_modules_categories['search_filter']['name'] = $this->l('Search & Filter');
$this->list_modules_categories['search_filter']['name'] = $this->l('Search and Filter');
$this->list_modules_categories['seo']['name'] = $this->l('SEO');
$this->list_modules_categories['shipping_logistics']['name'] = $this->l('Shipping & Logistics');
$this->list_modules_categories['shipping_logistics']['name'] = $this->l('Shipping and 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('Marketplace');
@@ -448,7 +448,7 @@ class AdminModulesControllerCore extends AdminController
if ($this->tabAccess['add'] === '1')
{
if (!isset($_FILES['file']['tmp_name']) || empty($_FILES['file']['tmp_name']))
$this->errors[] = $this->l('no file selected');
$this->errors[] = $this->l('No file has been selected');
elseif (substr($_FILES['file']['name'], -4) != '.tar' && substr($_FILES['file']['name'], -4) != '.zip'
&& substr($_FILES['file']['name'], -4) != '.tgz' && substr($_FILES['file']['name'], -7) != '.tar.gz')
$this->errors[] = Tools::displayError('Unknown archive type');
@@ -560,7 +560,7 @@ class AdminModulesControllerCore extends AdminController
// Check potential error
if (!($module = Module::getInstanceByName(urldecode($name))))
$this->errors[] = $this->l('module not found');
$this->errors[] = $this->l('Module not found');
elseif ($key == 'install' && $this->tabAccess['add'] !== '1')
$this->errors[] = Tools::displayError('You do not have permission to install a module.');
elseif ($key == 'uninstall' && ($this->tabAccess['delete'] !== '1' || !$module->getPermission('configure')))
@@ -988,7 +988,7 @@ 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 file upgrades applied (none exist)'))
1 => $this->l('No file upgrades applied (none exist).'))
);
}
else
controllers/admin/AdminOrderPreferencesController.php
+12 -12
View File
@@ -45,7 +45,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
$order_process_type = array(
array(
'value' => PS_ORDER_PROCESS_STANDARD,
'name' => $this->l('Standard (5 steps)')
'name' => $this->l('Standard (Five steps)')
),
array(
'value' => PS_ORDER_PROCESS_OPC,
@@ -60,7 +60,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
'fields' => array(
'PS_ORDER_PROCESS_TYPE' => array(
'title' => $this->l('Order process type'),
'desc' => $this->l('You can choose the order process type as either standard (5 steps) or One Page Checkout'),
'desc' => $this->l('Please choose either the five-step, or one-page, checkout process.'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',
@@ -75,14 +75,14 @@ class AdminOrderPreferencesControllerCore extends AdminController
'type' => 'bool'
),
'PS_PURCHASE_MINIMUM' => array(
'title' => $this->l('Minimum purchase total required in order to validate order'),
'title' => $this->l('Minimum purchase total required in order to validate the order.'),
'desc' => $this->l('Set to 0 to disable this feature'),
'validation' => 'isFloat',
'cast' => 'floatval',
'type' => 'price'
),
'PS_ALLOW_MULTISHIPPING' => array(
'title' => $this->l('Allow multi-shipping'),
'title' => $this->l('Allow multishipping'),
'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',
@@ -90,14 +90,14 @@ class AdminOrderPreferencesControllerCore extends AdminController
),
'PS_SHIP_WHEN_AVAILABLE' => array(
'title' => $this->l('Delayed shipping'),
'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.'),
'desc' => $this->l('This option allows you to delay shipping at your customers\' request. '),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_CONDITIONS' => array(
'title' => $this->l('Terms of service'),
'desc' => $this->l('Require customers to accept or decline terms of service before processing the order'),
'desc' => $this->l('Require customers to accept or decline terms of service before processing an order.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -107,8 +107,8 @@ class AdminOrderPreferencesControllerCore extends AdminController
)
),
'PS_CONDITIONS_CMS_ID' => array(
'title' => $this->l('Conditions of use CMS page'),
'desc' => $this->l('Choose the Conditions of use CMS page'),
'title' => $this->l('Conditions of use for the CMS page.'),
'desc' => $this->l('Choose the conditions of use for the CMS page.'),
'validation' => 'isInt',
'type' => 'select',
'list' => $cms_tab,
@@ -122,22 +122,22 @@ class AdminOrderPreferencesControllerCore extends AdminController
'icon' => 'tab-preferences',
'fields' => array(
'PS_GIFT_WRAPPING' => array(
'title' => $this->l('Offer gift-wrapping'),
'desc' => $this->l('Suggest gift-wrapping to customer and possibility of leaving a message'),
'title' => $this->l('Offer gift wrapping'),
'desc' => $this->l('Suggest gift-wrapping to customers.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_GIFT_WRAPPING_PRICE' => array(
'title' => $this->l('Gift-wrapping price'),
'desc' => $this->l('Set a price for gift-wrapping'),
'desc' => $this->l('Set a price for gift wrapping'),
'validation' => 'isPrice',
'cast' => 'floatval',
'type' => 'price'
),
'PS_GIFT_WRAPPING_TAX_RULES_GROUP' => array(
'title' => $this->l('Gift-wrapping tax'),
'desc' => $this->l('Set a tax for gift-wrapping'),
'desc' => $this->l('Set a tax for gift wrapping'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',
controllers/admin/AdminOrdersController.php
+8 -8
View File
@@ -100,7 +100,7 @@ class AdminOrdersControllerCore extends AdminController
'currency' => true
),
'payment' => array(
'title' => $this->l('Payment'),
'title' => $this->l('Payment: '),
'width' => 100
),
'osname' => array(
@@ -148,7 +148,7 @@ class AdminOrdersControllerCore extends AdminController
public function renderForm()
{
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && Shop::isFeatureActive())
$this->errors[] = $this->l('You have to select a shop in order to create new orders.');
$this->errors[] = $this->l('You have to select a shop before creating new orders.');
$id_cart = (int)Tools::getValue('id_cart');
$cart = new Cart((int)$id_cart);
@@ -183,7 +183,7 @@ class AdminOrdersControllerCore extends AdminController
'show_toolbar' => $this->show_toolbar,
'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => $this->toolbar_scroll,
'title' => array($this->l('Orders'), $this->l('create order'))
'title' => array($this->l('Orders'), $this->l('Create order'))
));
$this->content .= $this->createTemplate('form.tpl')->fetch();
}
@@ -496,7 +496,7 @@ class AdminOrdersControllerCore extends AdminController
if (Tools::isSubmit('generateDiscountRefund') && !count($this->errors))
{
$cart_rule = new CartRule();
$cart_rule->description = sprintf($this->l('Credit Slip for order #%d'), $order->id);
$cart_rule->description = sprintf($this->l('Credit card slip for order #%d'), $order->id);
$languages = Language::getLanguages(false);
foreach ($languages as $language)
// Define a temporary name
@@ -703,7 +703,7 @@ class AdminOrdersControllerCore extends AdminController
{
$cartrule = new CartRule();
$languages = Language::getLanguages($order);
$cartrule->description = sprintf($this->l('Credit Slip for order #%d'), $order->id);
$cartrule->description = sprintf($this->l('Credit card slip for order #%d'), $order->id);
foreach ($languages as $language)
{
// Define a temporary name
@@ -840,7 +840,7 @@ class AdminOrdersControllerCore extends AdminController
$employee = new Employee((int)Context::getContext()->cookie->id_employee);
$payment_module->validateOrder(
(int)$cart->id, (int)$id_order_state,
$cart->getOrderTotal(true, Cart::BOTH), $payment_module->displayName, $this->l('Manual order - Employee:').
$cart->getOrderTotal(true, Cart::BOTH), $payment_module->displayName, $this->l('Manual order -- Employee:').
Tools::safeOutput(substr($employee->firstname, 0, 1).'. '.$employee->lastname), array(), null, false, $cart->secure_key
);
if ($payment_module->currentOrder)
@@ -1463,10 +1463,10 @@ class AdminOrdersControllerCore extends AdminController
);
if (Mail::Send((int)$cart->id_lang, 'backoffice_order', Mail::l('Process the payment of your order', (int)$cart->id_lang), $mailVars, $customer->email,
$customer->firstname.' '.$customer->lastname, null, null, null, null, _PS_MAIL_DIR_, true, $cart->id_shop))
die(Tools::jsonEncode(array('errors' => false, 'result' => $this->l('The mail was sent to your customer.'))));
die(Tools::jsonEncode(array('errors' => false, 'result' => $this->l('The email was sent to your customer.'))));
}
}
$this->content = Tools::jsonEncode(array('errors' => true, 'result' => $this->l('Error in sending the e-mail to your customer.')));
$this->content = Tools::jsonEncode(array('errors' => true, 'result' => $this->l('Error in sending the email to your customer.')));
}
}
controllers/admin/AdminPPreferencesController.php
+18 -18
View File
@@ -39,15 +39,15 @@ class AdminPPreferencesControllerCore extends AdminController
'fields' => array(
'PS_CATALOG_MODE' => array(
'title' => $this->l('Catalog mode'),
'desc' => $this->l('When active, all shopping features 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('Products comparison'),
'desc' => $this->l('Set the maximum number of products that can be selected for comparison.').' '.$this->l('Set to 0 to disable this feature'),
'title' => $this->l('Product comparison'),
'desc' => $this->l('Set the maximum number of products that can be selected for comparison.').' '.$this->l('Set to "0" to disable this feature.'),
'validation' => 'isUnsignedId',
'required' => true,
'cast' => 'intval',
@@ -60,8 +60,8 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'text'
),
'PS_CART_REDIRECT' => array(
'title' => $this->l('Redirection after adding product to cart'),
'desc' => $this->l('Only for non-AJAX version of the cart'),
'title' => $this->l('Redirect after adding product to cart.'),
'desc' => $this->l('Only for non-AJAX versions of the cart.'),
'cast' => 'intval',
'show' => true,
'required' => false,
@@ -73,8 +73,8 @@ 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 (in characters)'),
'title' => $this->l('Max size of short description'),
'desc' => $this->l('Set the maximum size of product short description (in characters).'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
@@ -89,7 +89,7 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'radio',
'validation' => 'isBool',
'choices' => array(
0 => $this->l('Products'),
0 => $this->l('Products:'),
1 => $this->l('Combinations')
)
)
@@ -107,12 +107,12 @@ class AdminPPreferencesControllerCore extends AdminController
),
'PS_PRODUCTS_ORDER_BY' => array(
'title' => $this->l('Default order by'),
'desc' => $this->l('The order in which products are displayed in the 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')),
array('id' => '1', 'name' => $this->l('Product price')),
array('id' => '2', 'name' => $this->l('Product added date')),
array('id' => '2', 'name' => $this->l('Product add date')),
array('id' => '3', 'name' => $this->l('Product modified date')),
array('id' => '4', 'name' => $this->l('Position inside category')),
array('id' => '5', 'name' => $this->l('Manufacturer')),
@@ -142,7 +142,7 @@ class AdminPPreferencesControllerCore extends AdminController
'title' => $this->l('Product page'),
'fields' => array(
'PS_DISPLAY_QTIES' => array(
'title' => $this->l('Display available quantities on product page'),
'title' => $this->l('Display available quantities on the product page.'),
'desc' => '',
'validation' => 'isBool',
'cast' => 'intval',
@@ -150,15 +150,15 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'bool'
),
'PS_LAST_QTIES' => array(
'title' => $this->l('Display remaining quantities when qty is lower than'),
'desc' => $this->l('Set to 0 to disable this feature'),
'title' => $this->l('Display remaining quantities when the qty is lower than'),
'desc' => $this->l('Set to "0" to disable this feature.'),
'validation' => 'isUnsignedId',
'required' => true,
'cast' => 'intval',
'type' => 'text'
),
'PS_DISPLAY_JQZOOM' => array(
'title' => $this->l('Enable JqZoom instead of Thickbox on product page'),
'title' => $this->l('Enable JqZoom instead of Thickbox on the product page.'),
'desc' => '',
'validation' => 'isBool',
'cast' => 'intval',
@@ -166,7 +166,7 @@ class AdminPPreferencesControllerCore extends AdminController
'type' => 'bool'
),
'PS_DISP_UNAVAILABLE_ATTR' => array(
'title' => $this->l('Display unavailable product attributes on product page'),
'title' => $this->l('Display unavailable product attributes on the product page.'),
'desc' => '',
'validation' => 'isBool',
'cast' => 'intval',
@@ -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 the "add to cart" button when a product has attributes.'),
'desc' => $this->l('Display or hide the "add to cart" button on category pages for products that have attributes forcing customers to see product details.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
@@ -187,7 +187,7 @@ class AdminPPreferencesControllerCore extends AdminController
'fields' => array(
'PS_ORDER_OUT_OF_STOCK' => array(
'title' => $this->l('Allow ordering of out-of-stock products'),
'desc' => $this->l('Add to cart button is hidden when product is unavailable'),
'desc' => $this->l('Add to cart button is hidden when a product is unavailable'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,
controllers/admin/AdminPaymentController.php
+4 -4
View File
@@ -143,7 +143,7 @@ class AdminPaymentControllerCore extends AdminController
public function renderView()
{
$this->toolbar_title = $this->l('Payment');
$this->toolbar_title = $this->l('Payment: ');
unset($this->toolbar_btn['back']);
$shop_context = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP);
@@ -168,21 +168,21 @@ class AdminPaymentControllerCore extends AdminController
$lists = array(
array('items' => Currency::getCurrencies(),
'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.'),
'desc' => $this->l('Please mark each checkbox for the currency, or currencies, in 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('Group restrictions'),
'desc' => $this->l('Please mark the checkbox(es) for the groups for which you want the payment module(s) available.'),
'desc' => $this->l('Please mark each checkbox for the currency, or currencies, in which you want the payment module(s) to be available.'),
'name_id' => 'group',
'identifier' => 'id_group',
'icon' => 'group',
),
array('items' =>Country::getCountries($this->context->language->id),
'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.'),
'desc' => $this->l('Please mark each checkbox for the country, or countries, in which you want the payment module(s) to be available.'),
'name_id' => 'country',
'identifier' => 'id_country',
'icon' => 'world',
controllers/admin/AdminPerformanceController.php
+10 -10
View File
@@ -49,13 +49,13 @@ class AdminPerformanceControllerCore extends AdminController
'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
'value' => _PS_SMARTY_NO_COMPILE_,
'label' => $this->l('Never recompile template files'),
'desc' => $this->l('Templates are never recompiled, performance is better and this option should be used in production environment')
'desc' => $this->l('This option should be used in a production environment.')
),
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
'value' => _PS_SMARTY_CHECK_COMPILE_,
'label' => $this->l('Recompile templates if the files have been updated'),
'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.')
'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_,
@@ -155,7 +155,7 @@ class AdminPerformanceControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Features'),
'label' => $this->l('Features:'),
'name' => 'feature',
'class' => 't',
'is_bool' => true,
@@ -260,7 +260,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',
@@ -274,7 +274,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('Apache optimization'),
'name' => 'PS_HTACCESS_CACHE_CONTROL',
'class' => 't',
'desc' => $this->l('This will add directives to your .htaccess file which should improve caching and compression.'),
'desc' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
'is_bool' => true,
'values' => array(
array(
@@ -318,21 +318,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.')
),
)
);
@@ -430,7 +430,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable or disable caching system')
'desc' => $this->l('Enable or disable caching system.')
),
array(
'type' => 'select',
@@ -474,7 +474,7 @@ class AdminPerformanceControllerCore extends AdminController
),
'desc' => $this->l('Performance matters! Improve speed and conversions the easy way.').'<br />'.
$this->l('CloudCache supercharges your site in minutes through its state-of-the-art content delivery network.').'<br /><br />'.
$this->l('Subscribe now using the code "presta25" and get an exclusive discount of 25% per month on every available package.').'<br /><br />
$this->l('Subscribe now using the code "presta25" and get an exclusive 25% monthly discount on every available package.').'<br /><br />
<a style="color: blue" href="index.php?controller=AdminModules&token='.Tools::getAdminTokenLite('AdminModules').'&filtername=cloudcache" id="installCloudCache">&gt; '.$this->l('Click here to install the CloudCache module for PrestaShop').'</a><br />'
);
}
controllers/admin/AdminPreferencesController.php
+6 -6
View File
@@ -54,7 +54,7 @@ class AdminPreferencesControllerCore extends AdminController
$fields = array(
'PS_SSL_ENABLED' => array(
'title' => $this->l('Enable SSL'),
'desc' => $this->l('If your hosting provider allows SSL, you can activate SSL encryption (https://) for customer account identification and order processing'),
'desc' => $this->l('If your hosting provider allows SSL, you can activate SSL encryption (https://) for customer account identification and order processing.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -62,7 +62,7 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_TOKEN_ENABLE' => array(
'title' => $this->l('Increase Front Office security'),
'desc' => $this->l('Enable or disable token on the Front Office in order to improve PrestaShop security'),
'desc' => $this->l('Enable or disable token in the Front Office to improve PrestaShop\'s security.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -71,7 +71,7 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_PRICE_ROUND_MODE' => array(
'title' => $this->l('Round mode'),
'desc' => $this->l('You can choose how to round prices: always round superior; always round inferior, or classic rounding'),
'desc' => $this->l('You can choose how to round prices: Always round superior, always round inferior or classic rounding.'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',
@@ -80,14 +80,14 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_DISPLAY_SUPPLIERS' => array(
'title' => $this->l('Display suppliers and manufacturers'),
'desc' => $this->l('Display suppliers and manufacturers lists even if corresponding blocks are disabled'),
'desc' => $this->l('Display the suppliers and manufacturers lists even if corresponding blocks are disabled.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_MULTISHOP_FEATURE_ACTIVE' => array(
'title' => $this->l('Enable Multistore'),
'desc' => $this->l('Multistore feature allows you to manage several shops with one back-office. If this feature is enabled, a "Multistore" page will be available in the "Advanced Parameters" menu.'),
'desc' => $this->l('The multistore feature allows you to manage several e-shops with one Back Office. If this feature is enabled, a "Multistore" page will be available in the "Advanced Parameters" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -108,7 +108,7 @@ class AdminPreferencesControllerCore extends AdminController
'title' => $this->l('General'),
'icon' => 'tab-preferences',
'fields' => $fields,
'submit' => array('title' => $this->l(' Save '), 'class' => 'button'),
'submit' => array('title' => $this->l('Save '), 'class' => 'button'),
),
);
}
controllers/admin/AdminProductsController.php
+43 -43
View File
@@ -81,13 +81,13 @@ class AdminProductsControllerCore extends AdminController
'Seo' => $this->l('SEO'),
'Images' => $this->l('Images'),
'Associations' => $this->l('Associations'),
'Shipping' => $this->l('Shipping'),
'Shipping' => $this->l('Shipping:'),
'Combinations' => $this->l('Combinations'),
'Features' => $this->l('Features'),
'Features' => $this->l('Features:'),
'Customization' => $this->l('Customization'),
'Attachments' => $this->l('Attachments'),
'Quantities' => $this->l('Quantities'),
'Suppliers' => $this->l('Suppliers'),
'Suppliers' => $this->l('Suppliers:'),
'Warehouses' => $this->l('Warehouses'),
);
@@ -199,7 +199,7 @@ class AdminProductsControllerCore extends AdminController
if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP)
$this->fields_list['shopname'] = array(
'title' => $this->l('Default Shop'),
'title' => $this->l('Default shop:'),
'width' => 230,
'filter_key' => 'shop!name',
);
@@ -230,10 +230,10 @@ class AdminProductsControllerCore extends AdminController
'align' => 'right',
'filter_key' => 'sav!quantity',
'orderby' => true,
'hint' => $this->l('This is the quantity available in the current shop/group'),
'hint' => $this->l('This is the quantity available in the current shop/group.'),
);
$this->fields_list['active'] = array(
'title' => $this->l('Displayed'),
'title' => $this->l('Status'),
'width' => 70,
'active' => 'status',
'filter_key' => $alias.'!active',
@@ -382,7 +382,7 @@ class AdminProductsControllerCore extends AdminController
{
if ($_FILES['attachment_file']['size'] > (Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024 * 1024))
$this->errors[] = sprintf(
$this->l('File too large, maximum size allowed: %1$d kB. File size you\'re trying to upload is: %2$d kB.'),
$this->l('The file is too large. Maximum size allowed is: %1$d kB. The file you\'re trying to upload is: %2$d kB.'),
(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024),
number_format(($_FILES['attachment_file']['size'] / 1024), 2, '.', '')
);
@@ -401,7 +401,7 @@ class AdminProductsControllerCore extends AdminController
$max_post = (int)ini_get('post_max_size');
$upload_mb = min($max_upload, $max_post);
$this->errors[] = sprintf(
$this->l('The File %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
$this->l('The file %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
'<b>'.$_FILES['attachment_file']['name'].'</b> ',
'<b>'.$upload_mb.'</b>'
);
@@ -927,7 +927,7 @@ class AdminProductsControllerCore extends AdminController
if (!SpecificPrice::setPriorities($priorities))
$this->errors[] = Tools::displayError('An error occurred while updating priorities.');
else
$this->confirmations[] = $this->l('Price rule successfully updated');
$this->confirmations[] = $this->l('The price rule has successfully updated');
}
elseif (!SpecificPrice::setSpecificPriority((int)$obj->id, $priorities))
$this->errors[] = Tools::displayError('An error occurred while setting priorities.');
@@ -1277,7 +1277,7 @@ class AdminProductsControllerCore extends AdminController
else
$json = array(
'status' => 'error',
'message'=> $this->l('Cannot delete attribute')
'message'=> $this->l('You cannot delete this attribute.')
);
}
else
@@ -1308,7 +1308,7 @@ class AdminProductsControllerCore extends AdminController
else
$json = array(
'status' => 'error',
'message'=> $this->l('Cannot make default attribute')
'message'=> $this->l('You cannot make this the default attribute.')
);
die(Tools::jsonEncode($json));
@@ -1885,10 +1885,10 @@ class AdminProductsControllerCore extends AdminController
// Categories
if ($this->isProductFieldUpdated('id_category_default') && (!Tools::isSubmit('categoryBox') || !count(Tools::getValue('categoryBox'))))
$this->errors[] = $this->l('product must be in at least one Category');
$this->errors[] = $this->l('Products must be in at least one category.');
if ($this->isProductFieldUpdated('id_category_default') && (!is_array(Tools::getValue('categoryBox')) || !in_array(Tools::getValue('id_category_default'), Tools::getValue('categoryBox'))))
$this->errors[] = $this->l('product must be in the default category');
$this->errors[] = $this->l('This product must be in the default category.');
// Tags
foreach ($languages as $language)
@@ -2210,9 +2210,9 @@ 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 a 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>
<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" />
<br class="clear" />
</p>
@@ -2234,7 +2234,7 @@ class AdminProductsControllerCore extends AdminController
$this->toolbar_btn['delete'] = array(
'short' => 'Delete',
'href' => $this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;deleteproduct',
'desc' => $this->l('Delete this product'),
'desc' => $this->l('Delete this product.'),
'confirm' => 1,
'js' => 'if (confirm(\''.$this->l('Delete product?').'\')){return true;}else{event.preventDefault();}'
);
@@ -2328,7 +2328,7 @@ class AdminProductsControllerCore extends AdminController
{
$this->product_exists_in_shop = false;
if ($this->tab_display == 'Informations')
$this->displayWarning($this->l('Warning: this product does not exist in this shop.'));
$this->displayWarning($this->l('Warning: The product does not exist in this shop.'));
$default_product = new Product();
$fields_to_copy = array('minimal_quantity',
@@ -2815,7 +2815,7 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product before adding specific prices'));
$this->displayWarning($this->l('You must save this product before adding specific pricing'));
// prices part
$data->assign(array(
@@ -3026,7 +3026,7 @@ class AdminProductsControllerCore extends AdminController
if (!is_array($specific_prices) || !count($specific_prices))
$content .= '
<tr>
<td colspan="13">'.$this->l('No specific prices').'</td>
<td colspan="13">'.$this->l('No specific prices.').'</td>
</tr>';
else
{
@@ -3134,7 +3134,7 @@ class AdminProductsControllerCore extends AdminController
<div class="separation"></div>
<h4>'.$this->l('Priority management').'</h4>
<div class="hint" style="display:block;min-height:0;">
'.$this->l('Sometimes one customer can fit into multiple specific price rules. Priorities allow you to define which rule applies to the customer.').'
'.$this->l('Sometimes one customer can fit into multiple price rules. Priorities allow you to define which rule applies to the customer.').'
</div
<br /><br />
<label>'.$this->l('Priorities:').'</label>
@@ -3255,7 +3255,7 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product in this shop before adding customization.'));
$this->displayWarning($this->l('You must save the product in this shop before adding customization.'));
}
else
$this->displayWarning($this->l('You must save this product before adding customization.'));
@@ -3297,7 +3297,7 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product in this shop before adding attachements.'));
$this->displayWarning($this->l('You must save the product in this shop before adding attachements.'));
}
else
$this->displayWarning($this->l('You must save this product before adding attachements.'));
@@ -3484,7 +3484,7 @@ class AdminProductsControllerCore extends AdminController
);
}
else
$this->displayWarning($this->l('You must save this product in this shop before adding images.'));
$this->displayWarning($this->l('You must save the product in this shop before adding images.'));
}
else
$this->displayWarning($this->l('You must save this product before adding images.'));
@@ -3501,7 +3501,7 @@ class AdminProductsControllerCore extends AdminController
{
$data = $this->createTemplate($this->tpl_form);
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. ').
' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performances').'</a>');
else if (Validate::isLoadedObject($product))
{
@@ -3558,7 +3558,7 @@ class AdminProductsControllerCore extends AdminController
}
}
else
$this->displayWarning($this->l('You must save this product in this shop before adding combinations.'));
$this->displayWarning($this->l('You must save the product in this shop before adding combinations.'));
}
else
{
@@ -3751,10 +3751,10 @@ class AdminProductsControllerCore extends AdminController
}
if ($advanced_stock_management_warning)
{
$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 appropriate shops'));
$this->displayWarning($this->l('If you wish to use the advanced stock management, you must:'));
$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 appropriate shops.'));
}
$pack_quantity = null;
@@ -3801,7 +3801,7 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product in this shop before managing quantities.'));
$this->displayWarning($this->l('You must save the product in this shop before managing quantities.'));
}
else
$this->displayWarning($this->l('You must save this product before managing quantities.'));
@@ -3879,10 +3879,10 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product in this shop before managing suppliers'));
$this->displayWarning($this->l('You must save the product in this shop before managing suppliers.'));
}
else
$this->displayWarning($this->l('You must save this product before managing suppliers'));
$this->displayWarning($this->l('You must save this product before managing suppliers.'));
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
@@ -3929,10 +3929,10 @@ class AdminProductsControllerCore extends AdminController
));
}
else
$this->displayWarning($this->l('You must save this product in this shop before managing warehouses'));
$this->displayWarning($this->l('You must save the product in this shop before managing warehouses.'));
}
else
$this->displayWarning($this->l('You must save this product before managing warehouses'));
$this->displayWarning($this->l('You must save this product before managing warehouses.'));
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
@@ -3941,7 +3941,7 @@ class AdminProductsControllerCore extends AdminController
{
$data = $this->createTemplate($this->tpl_form);
if (!Feature::isFeatureActive())
$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. ').' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performances').'</a>');
else
{
if ($obj->id)
@@ -3978,7 +3978,7 @@ class AdminProductsControllerCore extends AdminController
$data->assign('default_form_language', $this->default_form_language);
}
else
$this->displayWarning($this->l('You must save this product in this shop before adding features.'));
$this->displayWarning($this->l('You must save the product in this shop before adding features.'));
}
else
$this->displayWarning($this->l('You must save this product before adding features.'));
@@ -4000,9 +4000,9 @@ class AdminProductsControllerCore extends AdminController
if ((int)Tools::getValue('value') != 0 && (int)Tools::getValue('value') != 1)
die (Tools::jsonEncode(array('error' => $this->l('Uncorrect value'))));
if (!$product->advanced_stock_management && (int)Tools::getValue('value') == 1)
die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is not enabled'))));
die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is disabled. '))));
if ($product->advanced_stock_management && Pack::isPack($product->id))
die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack'))));
die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack.'))));
StockAvailable::setProductDependsOnStock($product->id, (int)Tools::getValue('value'));
break;
@@ -4030,9 +4030,9 @@ class AdminProductsControllerCore extends AdminController
if ((int)Tools::getValue('value') != 1 && (int)Tools::getValue('value') != 0)
die (Tools::jsonEncode(array('error' => $this->l('Uncorrect value'))));
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int)Tools::getValue('value') == 1)
die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is not enabled'))));
die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is disabled. '))));
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Pack::isPack($product->id))
die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack'))));
die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack.'))));
$product->setAdvancedStockManagement((int)Tools::getValue('value'));
if (StockAvailable::dependsOnStock($product->id) == 1 && (int)Tools::getValue('value') == 0)
@@ -4144,7 +4144,7 @@ class AdminProductsControllerCore extends AdminController
'Consider changing the default category.' => $this->l('Consider changing the default category.'),
'ID' => $this->l('ID'),
'Name' => $this->l('Name'),
'Mark all checkbox(es) of categories in which product is to appear' => $this->l('Mark all checkbox(es) of categories in which product is to appear')
'Mark all checkbox(es) of categories in which product is to appear' => $this->l('Mark the checkbox of each categories in which this product will appear.')
);
return $trad[$key];
}
@@ -4154,9 +4154,9 @@ class AdminProductsControllerCore extends AdminController
$content = '<div class="warn">
<p>
<span style="float: left">
'.$this->l('Your product will be saved as a 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>
<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" />
<br class="clear" />
</p>
controllers/admin/AdminProfilesController.php
+1 -1
View File
@@ -92,7 +92,7 @@ class AdminProfilesControllerCore extends AdminController
/* PrestaShop demo mode*/
if (isset($_GET['delete'.$this->table]) && $_GET[$this->identifier] == (int)(_PS_ADMIN_PROFILE_))
$this->errors[] = $this->l('For security reasons, you cannot delete the Administrator profile');
$this->errors[] = $this->l('For security reasons, you cannot delete the Administrator\'s profile.');
else
parent::postProcess();
}
controllers/admin/AdminQuickAccessesController.php
+1 -1
View File
@@ -88,7 +88,7 @@ class AdminQuickAccessesControllerCore extends AdminController
'size' => 60,
'maxlength' => 128,
'required' => true,
'desc' => $this->l('If it\'s an URL that comes from your Back Office, you must NOT put a security token.')
'desc' => $this->l('If it\'s a URL that comes from your Back Office, you must NOT use a security token.')
),
array(
'type' => 'radio',
controllers/admin/AdminRangePriceController.php
+2 -2
View File
@@ -84,7 +84,7 @@ class AdminRangePriceControllerCore extends AdminController
'size' => 5,
'required' => true,
'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
'desc' => $this->l('Range start (included)'),
'desc' => $this->l('Start range (included)'),
'string_format' => '%.2f'
),
array(
@@ -94,7 +94,7 @@ class AdminRangePriceControllerCore extends AdminController
'size' => 5,
'required' => true,
'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
'desc' => $this->l('Range end (excluded)'),
'desc' => $this->l('End range (excluded)'),
'string_format' => '%.2f'
),
),
controllers/admin/AdminRangeWeightController.php
+2 -2
View File
@@ -82,7 +82,7 @@ class AdminRangeWeightControllerCore extends AdminController
'size' => 5,
'required' => true,
'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
'desc' => $this->l('Range start (included)'),
'desc' => $this->l('Start range (included)'),
),
array(
'type' => 'text',
@@ -91,7 +91,7 @@ class AdminRangeWeightControllerCore extends AdminController
'size' => 5,
'required' => true,
'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
'desc' => $this->l('Range end (excluded)'),
'desc' => $this->l('End range (excluded)'),
),
),
'submit' => array(
controllers/admin/AdminReferrersController.php
+3 -3
View File
@@ -204,7 +204,7 @@ class AdminReferrersControllerCore extends AdminController
)
),
'desc' => array(
$this->l('Affiliates can access their own data with this name and password.'),
$this->l('Affiliates can access their data with this name and password.'),
$this->l('Front access:').' <a href="'.$uri.'modules/trackingfront/stats.php" style="font-style: italic;">'.$uri.'modules/trackingfront/stats.php</a>'
)
));
@@ -250,7 +250,7 @@ class AdminReferrersControllerCore extends AdminController
$this->fields_form[2] = array('form' => array(
'legend' => array(
'title' => $this->l('Technical information - Simple mode'),
'title' => $this->l('Technical information -- Simple mode.'),
'image' => '../img/admin/affiliation.png'
),
'help' => true,
@@ -296,7 +296,7 @@ class AdminReferrersControllerCore extends AdminController
$this->fields_form[3] = array('form' => array(
'legend' => array(
'title' => $this->l('Technical information - Expert mode'),
'title' => $this->l('Technical information -- Expert mode'),
'image' => '../img/admin/affiliation.png'
),
'input' => array(
controllers/admin/AdminRequestSqlController.php
+4 -4
View File
@@ -104,14 +104,14 @@ class AdminRequestSqlControllerCore extends AdminController
$this->display = null;
$this->initToolbar();
$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" is allowed.'));
$this->displayInformation('
<strong>'.$this->l('How to create a new sql query?').'</strong><br />
<strong>'.$this->l('How do I create a new sql query?').'</strong><br />
<ul>
<li>'.$this->l('Click "Add new".').'</li>
<li>'.$this->l('Click "Add New".').'</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>
<li>'.$this->l('You can also export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif" /></li>
</ul>');
$this->addRowAction('export');
controllers/admin/AdminReturnController.php
+2 -2
View File
@@ -46,8 +46,8 @@ 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 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'),
'PS_ORDER_RETURN' => array('title' => $this->l('Enable returns:'), 'desc' => $this->l('Would you like to allow merchandise returns in your shop?'), 'cast' => 'intval', 'type' => 'bool'),
'PS_ORDER_RETURN_NB_DAYS' => array('title' => $this->l('Time limit of validity:'), 'desc' => $this->l('How many days after the delivery date does the customer have to return a product?'), 'cast' => 'intval', 'type' => 'text', 'size' => '2'),
),
'submit' => array()
),
controllers/admin/AdminScenesController.php
+6 -6
View File
@@ -153,13 +153,13 @@ class AdminScenesControllerCore extends AdminController
'type' => 'description',
'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.').
'text' => $this->l('When a customer hovers over the image, a pop-up appears displaying a brief description of the product.').
$this->l('The customer can then click to open the 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('When you have finished mapping zones, click Save Image Map.')
$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, and a list of products will appear.').
$this->l('Click the appropriate product and 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(
'type' => 'text',
controllers/admin/AdminSearchConfController.php
+15 -15
View File
@@ -47,7 +47,7 @@ class AdminSearchConfControllerCore extends AdminController
$this->fields_list = array(
'alias' => array('title' => $this->l('Aliases'), 'width' => 'auto'),
'search' => array('title' => $this->l('Search'), 'width' => 100),
'search' => array('title' => $this->l('Search:'), 'width' => 100),
'active' => array('title' => $this->l('Status'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
);
@@ -63,15 +63,15 @@ class AdminSearchConfControllerCore extends AdminController
'title' => $this->l('Indexation'),
'icon' => 'search',
'info' =>
$this->l('The "indexed" products have been analyzed 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 a 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 stops the process before it ends, you can resume the indexation by clicking "Add missing products."').'</p>
<p>'.$this->l('Building the product index may take a few minutes.')
.$this->l('If your server stops before the process ends, you can resume the indexation by clicking "Add missing products."').'</p>
-&gt; <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
$this->l('Add missing products to index.').'</a><br />
$this->l('Add missing products to the index.').'</a><br />
-&gt; <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('Re-build the entire index.').'</a><br /><br />
'.$this->l('You can set a cron job that will rebuild your index using the following URL:').' <a href="'.$cron_url.'">'.$cron_url.'</a>',
'fields' => array(
'PS_SEARCH_INDEXATION' => array(
@@ -79,12 +79,12 @@ class AdminSearchConfControllerCore extends AdminController
'validation' => 'isBool',
'type' => 'bool',
'cast' => 'intval',
'desc' => $this->l('Enable automatic indexation of the products. If you enable this feature, the products will be indexed in the search automatically when they are saved, but if the feature is disabled, you will have to index the products manually by using the links provided in this fieldset.')
'desc' => $this->l('Enable the automatic indexation of products. If you enable this feature, the products will be indexed in the search automatically when they are saved. If the feature is disabled, you will have to index products manually by using the links provided in the field set.')
)
)
),
'search' => array(
'title' => $this->l('Search'),
'title' => $this->l('Search:'),
'icon' => 'search',
'fields' => array(
'PS_SEARCH_AJAX' => array(
@@ -113,7 +113,7 @@ class AdminSearchConfControllerCore extends AdminController
'title' => $this->l('Blacklisted words'),
'size' => 35,
'validation' => 'isGenericName',
'desc' => $this->l('Please enter the words separated by a "|".'),
'desc' => $this->l('Please enter the index words separated by a "|".'|".'),
'type' => 'textLang'
)
),
@@ -123,9 +123,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('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 product than the ones in the description. Thus, the search results will be as precise and relevant as possible.'),
$this->l('The "weight" represents its importance and relevance for the ranking of the products when completing a new search.').'<br />
'.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'<br /><br />
'.$this->l('We advise you to set a greater weight for words which appear in the name or reference of a product. This will allow the search results to be as precise and relevant as possible.'),
'fields' => array(
'PS_SEARCH_WEIGHT_PNAME' => array(
'title' => $this->l('Product name weight'),
@@ -270,12 +270,12 @@ class AdminSearchConfControllerCore extends AdminController
$string = strval(Tools::getValue('alias'));
$aliases = explode(',', $string);
if (empty($search) || empty($string))
$this->errors[] = $this->l('aliases and result are both required');
$this->errors[] = $this->l('Aliases and results are both required.');
if (!Validate::isValidSearch($search))
$this->errors[] = $search.' '.$this->l('is not a valid result');
$this->errors[] = $search.' '.$this->l('Is not a valid result');
foreach ($aliases as $alias)
if (!Validate::isValidSearch($alias))
$this->errors[] = $alias.' '.$this->l('is not a valid alias');
$this->errors[] = $alias.' '.$this->l('Is not a valid alias');
if (!count($this->errors))
{
controllers/admin/AdminSearchController.php
+1 -1
View File
@@ -265,7 +265,7 @@ class AdminSearchControllerCore extends AdminController
'id_gender' => array('title' => $this->l('Titles'), 'align' => 'center', 'icon' => $genders_icon, 'list' => $genders, 'width' => 25),
'firstname' => array('title' => $this->l('First Name'), 'align' => 'left', 'width' => 150),
'lastname' => array('title' => $this->l('Name'), 'align' => 'left', 'width' => 'auto'),
'email' => array('title' => $this->l('E-mail address'), 'align' => 'left', 'width' => 250),
'email' => array('title' => $this->l('Email address'), 'align' => 'left', 'width' => 250),
'birthday' => array('title' => $this->l('Birth 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),
controllers/admin/AdminShippingController.php
+1 -1
View File
@@ -64,7 +64,7 @@ class AdminShippingControllerCore extends AdminController
),
'description' =>
'<ul>
<li>'.$this->l('If you set these parameters to 0, they will be disabled').'</li>
<li>'.$this->l('If you set these parameters to 0, they will be disabled.').'</li>
<li>'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
</ul>',
'submit' => array()
controllers/admin/AdminShopController.php
+16 -16
View File
@@ -58,7 +58,7 @@ class AdminShopControllerCore extends AdminController
'filter_key' => 'cl!name'
),
'url' => array(
'title' => $this->l('Shop main URL'),
'title' => $this->l('The shop\'s main URL'),
'havingFilter' => 'url',
),
/*'active' => array(
@@ -324,7 +324,7 @@ class AdminShopControllerCore extends AdminController
array(
'type' => 'text',
'label' => $this->l('Shop name:'),
'desc' => $this->l('This field do not refer to the shop name visible on the front office.').' '.
'desc' => $this->l('This field does not refer to the shop name visible in the front office.').' '.
sprintf($this->l('Follow %sthis link%s to edit the shop name used on the front office.'), '<a href="'.$this->context->link->getAdminLink('AdminStores').'">', '</a>'),
'name' => 'name',
'required' => true,
@@ -355,7 +355,7 @@ class AdminShopControllerCore extends AdminController
}
if ($this->display == 'add')
$group_desc = $this->l('Warning: you won\'t be able to change the group of this shop if this shop belongs to a group with one of these options activated: Share Customers, Share Quantities or Share Orders');
$group_desc = $this->l('Warning: You won\'t be able to change the group of this shop if this shop belongs to a group with one of these options activated: Share Customers, Share Quantities or Share Orders.');
else
$group_desc = $this->l('You can only move your shop to a shop group with all "share" options disabled or to a shop group with no customers/orders.');
@@ -381,7 +381,7 @@ class AdminShopControllerCore extends AdminController
$this->fields_form['input'][] = array(
'type' => 'textShopGroup',
'label' => $this->l('Shop group:'),
'desc' => $this->l('You can\'t edit the shop group because the current shop belongs to a group with a "share" option enabled.'),
'desc' => $this->l('You can\'t edit the shop group because the current shop belongs to a group with the "share" option enabled.'),
'name' => 'id_shop_group',
'value' => $group->name
);
@@ -412,7 +412,7 @@ class AdminShopControllerCore extends AdminController
'name' => 'categoryBox',
'label' => $this->l('Associated categories:'),
'category_tree' => $this->initCategoriesAssociation($parent),
'desc' => $this->l('By selecting categories associated, you choose to share the categories between different shops. Once associated between the shops, any alteration of an associated category will impact all the shops for which those categories will be associated.')
'desc' => $this->l('By selecting associated categories, you are choosing to share the categories between shops. Once associated between shops, any alteration of this category will impact every shop.')
);
/*$this->fields_form['input'][] = array(
'type' => 'radio',
@@ -433,7 +433,7 @@ class AdminShopControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable or disable shop')
'desc' => $this->l('Enable or disable your store?')
);*/
$themes = Theme::getThemes();
@@ -463,20 +463,20 @@ class AdminShopControllerCore extends AdminController
$disabled = false;
$import_data = array(
'carrier' => $this->l('Carriers'),
'carrier' => $this->l('Carriers:'),
'cms' => $this->l('CMS page'),
'contact' => $this->l('Contact'),
'country' => $this->l('Countries'),
'currency' => $this->l('Currencies'),
'currency' => $this->l('Currencies:'),
'discount' => $this->l('Discounts'),
'employee' => $this->l('Employees'),
'image' => $this->l('Images'),
'lang' => $this->l('Langs'),
'manufacturer' => $this->l('Manufacturers'),
'module' => $this->l('Modules'),
'manufacturer' => $this->l('Manufacturers:'),
'module' => $this->l('modules'),
'hook_module' => $this->l('Module hooks'),
'meta_lang' => $this->l('Meta'),
'product' => $this->l('Products'),
'product' => $this->l('Products:'),
'product_attribute' => $this->l('Combinations'),
'scene' => $this->l('Scenes'),
'stock_available' => $this->l('Available quantities for sale'),
@@ -484,10 +484,10 @@ class AdminShopControllerCore extends AdminController
'warehouse' => $this->l('Warehouse'),
'webservice_account' => $this->l('Webservice accounts'),
'attribute_group' => $this->l('Attribute groups'),
'feature' => $this->l('Features'),
'feature' => $this->l('Features:'),
'group' => $this->l('Customer groups'),
'tax_rules_group' => $this->l('Tax rules groups'),
'supplier' => $this->l('Suppliers'),
'supplier' => $this->l('Suppliers:'),
'referrer' => $this->l('Referrers'),
'zone' => $this->l('Zones'),
'cart_rule' => $this->l('Cart rules'),
@@ -523,7 +523,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 for the selected shop')
'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way for each selected shop.')
);
$this->fields_value = array(
@@ -665,7 +665,7 @@ class AdminShopControllerCore extends AdminController
'icon' => 'themes/'.$this->context->employee->bo_theme.'/img/tree-multishop-groups.png',
'attr' => array(
'href' => $this->context->link->getAdminLink('AdminShop').'&id_shop_group='.$id_shop_group,
'title' => sprintf($this->l('Click here to display shops of group %s'), $row['group_name']),
'title' => sprintf($this->l('Click here to display the shops in group %s'), $row['group_name']),
)
),
'attr' => array(
@@ -685,7 +685,7 @@ class AdminShopControllerCore extends AdminController
'icon' => 'themes/'.$this->context->employee->bo_theme.'/img/tree-multishop-shop.png',
'attr' => array(
'href' => $this->context->link->getAdminLink('AdminShopUrl').'&id_shop='.$id_shop,
'title' => sprintf($this->l('Click here to display URLs of shop %s'), $row['shop_name']),
'title' => sprintf($this->l('Click here to display the URLs of shops %s'), $row['shop_name']),
)
),
'attr' => array(
controllers/admin/AdminShopGroupController.php
+8 -8
View File
@@ -99,11 +99,11 @@ class AdminShopGroupControllerCore extends AdminController
{
unset($this->toolbar_btn);
$this->toolbar_btn['new'] = array(
'desc' => $this->l('Add new shop group'),
'desc' => $this->l('Add a new shop group'),
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
);
$this->toolbar_btn['new_2'] = array(
'desc' => $this->l('Add new shop'),
'desc' => $this->l('Add a new shop'),
'href' => $this->context->link->getAdminLink('AdminShop').'&amp;addshop',
'imgclass' => 'new'
);
@@ -128,9 +128,9 @@ class AdminShopGroupControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Shop Group')
'title' => $this->l('Shop group:')
),
'description' => $this->l('Warning: it is not recommended to enable the "share customers" and "share orders" options, because once they are activated and customers or orders are created, you will not be able to disable these options. If you need these options, try to first consider using several categories instead on several shops.'),
'description' => $this->l('Warning: Enabling the "share customers" and "share orders" options is not recommended. Once activated and orders are created, you will not be able to disable these options. If you need these options, we recommend using several categories rather than several shops.'),
'input' => array(
array(
'type' => 'text',
@@ -158,7 +158,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Once the option is enabled, the shops in this group will share their customers: if a customer registers on one of this group\'s shops, the account will automatically be available on the others shops of this goup. Warning: you will not be able to disable this option once you have customers registered on at least one shop of this group.'),
'desc' => $this->l('Once this option is enabled, the shops in this group will share customers. If a customer registers in any one of these shops, the account will automatically be available in the others shops of this goup. rnrnWarning: you will not be able to disable this option once you have registered customers.'),
),
array(
'type' => 'radio',
@@ -179,7 +179,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Share available quantities to sell between shops of this group. When changing this option, all products available quantities for this group will be reset to 0.'),
'desc' => $this->l('Share available quantities between shops of this group. When changing this option, all available products quantities will be reset to 0.'),
),
array(
'type' => 'radio',
@@ -201,7 +201,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared among all the shops in this group. This way, any purchase started on one of the shops in this group will be able to be finished in another shop from the same shop group. Warning: you will not be able to disable this option once you have orders on at least one shop of this group.')
'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared by all shops in this group. This way, any purchase started in one shop will be able to be completed in another shop from the same group. rnrnWarning: You will not be able to disable this option once you\'ve started to accept orders.')
),
array(
'type' => 'radio',
@@ -222,7 +222,7 @@ class AdminShopGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable or disable group shop')
'desc' => $this->l('Enable or disable group shops?')
)
),
'submit' => array(
controllers/admin/AdminShopUrlController.php
+8 -8
View File
@@ -107,11 +107,11 @@ class AdminShopUrlControllerCore extends AdminController
$this->multiple_fieldsets = true;
if (!$update_htaccess)
$desc_virtual_uri = array(
'<span class="warning_mod_rewrite">'.$this->l('You need to activate the URL Rewriting if you want to add a virtual URI.').'</span>'
'<span class="warning_mod_rewrite">'.$this->l('You need to activate URL Rewriting if you want to add a virtual URL.').'</span>'
);
else
$desc_virtual_uri = array(
$this->l('You can use this option if you want to create a store with a 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).'),
$this->l('You can use this option if you want to create a store with a URL 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 URL).'),
'<strong>'.$this->l('URL rewriting must be activated on your server to use this feature.').'</strong>'
);
$this->fields_form = array(
@@ -158,11 +158,11 @@ class AdminShopUrlControllerCore extends AdminController
'desc' => array(
$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 the Main URL'),
'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 the Main URL, the older one will be set as the Normal URL.'),
'text' => $this->l('The selected shop already has a Main URL. Therefore, if you set this one as the Main URL, the older of the two will be set as the normal URL.'),
'id' => 'mainUrlInfoExplain'
)
)
@@ -214,18 +214,18 @@ class AdminShopUrlControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('Physical URI:'),
'label' => $this->l('Physical URL:'),
'name' => 'physical_uri',
'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).'),
'desc' => $this->l('This is the physical folder for your store on the 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 input my-store/ in this field).'),
'size' => 50,
),
array(
'type' => 'text',
'label' => $this->l('Virtual URI:'),
'label' => $this->l('Virtual URL:'),
'name' => 'virtual_uri',
'desc' => $desc_virtual_uri,
'size' => 50,
'hint' => (!$update_htaccess) ? $this->l('Warning: URL rewriting (e.g. mod_rewrite for Apache) seems to be disabled. If your URL don\'t work, please check with your host provider how to activate URL rewriting.') : '',
'hint' => (!$update_htaccess) ? $this->l('Warning: URL rewriting (e.g. mod_rewrite for Apache) seems to be disabled. If your URL doesn\'t work, please check with your host provider on how to activate URL rewriting.') : '',
),
array(
'type' => 'text',
controllers/admin/AdminSlipController.php
+1 -1
View File
@@ -133,7 +133,7 @@ class AdminSlipControllerCore extends AdminController
$order_slips = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
if (count($order_slips))
Tools::redirectAdmin($this->context->link->getAdminLink('AdminPdf').'&submitAction=generateOrderSlipsPDF&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')));
$this->errors[] = $this->l('No order slips found for this period');
$this->errors[] = $this->l('No order slips were found for this period.');
}
}
else
controllers/admin/AdminStatesController.php
+2 -2
View File
@@ -106,7 +106,7 @@ class AdminStatesControllerCore extends AdminController
'size' => 30,
'maxlength' => 32,
'required' => true,
'desc' => $this->l('State name to display in addresses and on invoices')
'desc' => $this->l('Provide the State name to be display in addresses and on invoices.')
),
array(
'type' => 'text',
@@ -142,7 +142,7 @@ class AdminStatesControllerCore extends AdminController
'name' => 'name'
),
'desc' => array(
$this->l('Geographical zone where this state is located'),
$this->l('Geographical region where this state is located.'),
$this->l('Used for shipping')
)
),
controllers/admin/AdminStatusesController.php
+12 -12
View File
@@ -88,7 +88,7 @@ class AdminStatusesControllerCore extends AdminController
'search' => false
),
'send_email' => array(
'title' => $this->l('Send e-mail to customer'),
'title' => $this->l('Send email to customer'),
'align' => 'center',
'icon' => array(
'1' => 'enabled.gif',
@@ -110,7 +110,7 @@ class AdminStatusesControllerCore extends AdminController
'orderby' => false
),
'template' => array(
'title' => $this->l('E-mail template'),
'title' => $this->l('Email template'),
'width' => 120
)
);
@@ -254,14 +254,14 @@ 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)').' "lightblue", "#CC6600")'
),
array(
'type' => 'checkbox',
'name' => 'logable',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Consider the associated order as validated'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Consider the associated order as validated.'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -272,7 +272,7 @@ class AdminStatusesControllerCore extends AdminController
'name' => 'invoice',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Allow customer to download and view PDF version of invoice'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Allow a customer to download and view PDF versions of their invoice.'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -294,7 +294,7 @@ class AdminStatusesControllerCore extends AdminController
'name' => 'send_email',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Send e-mail to customer when order status is changed'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Send an email to the customer when his/her order status has changed.'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -305,7 +305,7 @@ class AdminStatusesControllerCore extends AdminController
'name' => 'shipped',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Set order as shipped'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Set the order as shipped'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -316,7 +316,7 @@ class AdminStatusesControllerCore extends AdminController
'name' => 'paid',
'values' => array(
'query' => array(
array('id' => 'on', 'name' => $this->l('Set order as paid'), 'val' => '1'),
array('id' => 'on', 'name' => $this->l('Set the order as paid'), 'val' => '1'),
),
'id' => 'id',
'name' => 'name'
@@ -332,8 +332,8 @@ class AdminStatusesControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'hint' => $this->l('Only letters, number and -_ are allowed'),
'desc' => $this->l('E-mail template for both .html and .txt')
'hint' => $this->l('Only letters, number and hashtags are allowed.'),
'desc' => $this->l('Email template for both .html and .txt')
)
),
'submit' => array(
@@ -376,14 +376,14 @@ class AdminStatusesControllerCore extends AdminController
'size' => 40,
'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order return status name')
'desc' => $this->l('Order\'s return status name')
),
array(
'type' => 'color',
'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)').' "lightblue", "#CC6600")'
)
),
'submit' => array(
controllers/admin/AdminStockConfigurationController.php
+22 -22
View File
@@ -84,7 +84,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'title' => $this->l('Options'),
'fields' => array(
'PS_STOCK_MVT_INC_REASON_DEFAULT' => array(
'title' => $this->l('Default label when increasing stock:'),
'title' => $this->l('Default label for increasing stock:'),
'cast' => 'intval',
'type' => 'select',
'list' => $reasons_inc,
@@ -92,7 +92,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_STOCK_MVT_DEC_REASON_DEFAULT' => array(
'title' => $this->l('Default label when decreasing stock:'),
'title' => $this->l('Default label for decreasing stock:'),
'cast' => 'intval',
'type' => 'select',
'list' => $reasons_dec,
@@ -100,7 +100,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_STOCK_CUSTOMER_ORDER_REASON' => array(
'title' => $this->l('Default label when decreasing stock when a customer order is shipped:'),
'title' => $this->l('Default label for decreasing stock when a customer order is shipped:'),
'cast' => 'intval',
'type' => 'select',
'list' => $reasons_dec,
@@ -108,7 +108,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_STOCK_MVT_SUPPLY_ORDER' => array(
'title' => $this->l('Default label when increasing stock when a supply order is received:'),
'title' => $this->l('Default label for increasing stock when a supply order is received:'),
'cast' => 'intval',
'type' => 'select',
'list' => $reasons_inc,
@@ -155,7 +155,7 @@ class AdminStockConfigurationControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Stock Movement Label'),
'title' => $this->l('Stock Movement label'),
'image' => '../img/admin/edit.gif'
),
'input' => array(
@@ -186,7 +186,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'desc' => $this->l('Select the corresponding action: increase or decrease stock.')
'desc' => $this->l('Select the corresponding action: Increase or decrease stock?')
),
),
'submit' => array(
@@ -220,7 +220,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('The background of the PrestaShop Back Office will be displayed in this color (HTML colors only, please).'),
),
array(
'type' => 'radio',
@@ -241,7 +241,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('Define if it is possible to edit the order. An editable order is not valid to send to the supplier.')
'desc' => $this->l('Is it is possible to edit the order? Keep in mind that an editable order can not be sent to the supplier.')
),
array(
'type' => 'radio',
@@ -262,7 +262,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('Define if it is possible to generate a delivery note of the order.')
'desc' => $this->l('Is it possible to generate a delivery note for the order?')
),
array(
'type' => 'radio',
@@ -283,7 +283,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'label' => $this->l('No')
)
),
'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.'),
'desc' => $this->l('Define if products have been either partially or completely received. This will allow you to know if ordered products have to be added to the corresponding warehouse.'),
),
array(
'type' => 'radio',
@@ -304,7 +304,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('Customer is awaiting delivery')
'desc' => $this->l('The customer is awaiting delivery.')
),
),
'submit' => array(
@@ -317,7 +317,7 @@ class AdminStockConfigurationControllerCore extends AdminController
$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);
@@ -326,7 +326,7 @@ class AdminStockConfigurationControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Supply Order status'),
'title' => $this->l('Supply order status'),
'image' => '../img/admin/edit.gif'
),
'input' => array(
@@ -343,7 +343,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'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('The background of PrestaShop\'s Back Office will be displayed in this color (HTML colors only, please).'),
),
),
'submit' => array(
@@ -380,7 +380,7 @@ class AdminStockConfigurationControllerCore extends AdminController
/**
* General messages displayed for all lists
*/
$this->displayInformation($this->l('This interface allows you to configure your supply order statuses and stock movement labels.').'<br />');
$this->displayInformation($this->l('This interface allows you to configure your supply order status and stock movement labels.').'<br />');
// Checks access
if (!($this->tabAccess['add'] === '1'))
@@ -453,7 +453,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'orderby' => false
),
'delivery_note' => array(
'title' => $this->l('Delivery note available?'),
'title' => $this->l('Is there a delivery note available?'),
'align' => 'center',
'icon' => array(
'1' => 'enabled.gif',
@@ -464,7 +464,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'orderby' => false
),
'pending_receipt' => array(
'title' => $this->l('Is a pending receipt state?'),
'title' => $this->l('Is there a pending receipt?'),
'align' => 'center',
'icon' => array(
'1' => 'enabled.gif',
@@ -475,7 +475,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'orderby' => false
),
'receipt_state' => array(
'title' => $this->l('Is a delivery state?'),
'title' => $this->l('Delivery state?'),
'align' => 'center',
'icon' => array(
'1' => 'enabled.gif',
@@ -486,7 +486,7 @@ class AdminStockConfigurationControllerCore extends AdminController
'orderby' => false
),
'enclosed' => array(
'title' => $this->l('Is an enclosed order state?'),
'title' => $this->l('Enclosed order state?'),
'align' => 'center',
'icon' => array(
'1' => 'enabled.gif',
@@ -547,7 +547,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. It may 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.');
}
}
}
@@ -556,7 +556,7 @@ class AdminStockConfigurationControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initContent();
@@ -566,7 +566,7 @@ class AdminStockConfigurationControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initProcess();
controllers/admin/AdminStockCoverController.php
+4 -4
View File
@@ -76,7 +76,7 @@ class AdminStockCoverControllerCore extends AdminController
'width' => 160,
'orderby' => false,
'search' => false,
'hint' => $this->l('Days left before you run out of stock.'),
'hint' => $this->l('Days left before your stock runs out.'),
),
'stock' => array(
'title' => $this->l('Quantity'),
@@ -213,7 +213,7 @@ class AdminStockCoverControllerCore extends AdminController
'warn_days' => $this->getCurrentWarning()
);
$this->displayInformation($this->l('Considering the coverage period choosen and the quantity of products/combinations that you sold,'));
$this->displayInformation($this->l('Considering the coverage period chosen and the quantity of products/combinations that you sold.'));
$this->displayInformation($this->l('this interface gives you an idea of when a product will run out of stock.'));
return parent::renderList();
@@ -356,7 +356,7 @@ class AdminStockCoverControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initContent();
@@ -366,7 +366,7 @@ class AdminStockCoverControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initProcess();
controllers/admin/AdminStockInstantStateController.php
+4 -4
View File
@@ -94,7 +94,7 @@ class AdminStockInstantStateControllerCore extends AdminController
'width' => 80,
'orderby' => true,
'search' => false,
'hint' => $this->l('Pysical qty (usable) - Clients orders + Supply Orders'),
'hint' => $this->l('Pysical quantity (usable) - Client orders + Supply Orders'),
),
);
@@ -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 information on your stock per warehouse.'));
$this->displayInformation($this->l('This interface allows you to display detailed information about your stock per warehouse.'));
// sets toolbar
$this->initToolbar();
@@ -446,7 +446,7 @@ class AdminStockInstantStateControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initContent();
@@ -456,7 +456,7 @@ class AdminStockInstantStateControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initProcess();
controllers/admin/AdminStockManagementController.php
+30 -30
View File
@@ -61,7 +61,7 @@ class AdminStockManagementControllerCore extends AdminController
),
'stock' => array(
'title' => $this->l('Quantity'),
'hint' => $this->l('Sum of quantities for all warehouses'),
'hint' => $this->l('Quantitity total for all warehouses.'),
'width' => 100,
'orderby' => false,
'filter' => false,
@@ -73,9 +73,9 @@ class AdminStockManagementControllerCore extends AdminController
// overrides confirmation messages specifically for this controller
$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 completed'),
1 => $this->l('The product was successfully added to your stock.'),
2 => $this->l('The product was successfully removed from your stock.'),
3 => $this->l('The transfer was successfully completed.'),
);
}
@@ -104,11 +104,11 @@ class AdminStockManagementControllerCore extends AdminController
$this->_group = 'GROUP BY a.id_product';
// 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 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" page under the "Stock" menu.').'<br />');
$this->displayInformation($this->l('Finally, you will be asked to specify the state of the quantity you will add:'));
$this->displayInformation($this->l('This interface allows you to manage product stock and their variations.').'<br />');
$this->displayInformation($this->l('Through this interface, you can increase and decrease product stock for an given warehouse.'));
$this->displayInformation($this->l('Furthermore, you can alter product quantities between warehouses, or within one warehouse.').'<br />');
$this->displayInformation($this->l('If you want to increase quantities of multiple products at once, you can use the "Supply orders" page under the "Stock" menu.').'<br />');
$this->displayInformation($this->l('Finally, you need to provide the quantity that you\'ll be adding:'));
$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).'));
@@ -131,7 +131,7 @@ class AdminStockManagementControllerCore extends AdminController
// displays warning if no warehouses
if (!$warehouses_add)
$this->displayWarning($this->l('You have to have Warehouses before adding stock. See Stock/Warehouses'));
$this->displayWarning($this->l('You must choose a warehouses before adding stock. See Stock/Warehouses'));
//get currencies list
$currencies = Currency::getCurrencies();
@@ -160,12 +160,12 @@ class AdminStockManagementControllerCore extends AdminController
$last_sm_unit_price_te = Tools::displayPrice((float)$last_sm['price_te'], $last_sm_currency);
}
$this->displayInformation($this->l('Note that rolling over the quantity and price fields will give you the details of the last stock movement.'));
$this->displayInformation($this->l('Rolling over the quantity and price fields will give you the details about the last stock movement.'));
// fields in the form
$this->fields_form[]['form'] = array(
'legend' => array(
'title' => $this->l('Add product to stock'),
'title' => $this->l('Add a product to your stock.'),
'image' => '../img/admin/add_stock.png'
),
'input' => array(
@@ -224,7 +224,7 @@ class AdminStockManagementControllerCore extends AdminController
'hint' => sprintf(
$this->l('Last physical quantity added : %s (%s)'),
($last_sm_quantity > 0 ? $last_sm_quantity : $this->l('N/A')),
($last_sm_quantity > 0 ? ($last_sm_quantity_is_usable >= 0 ? $this->l('usable') : $this->l('not usable')) : $this->l('N/A'))),
($last_sm_quantity > 0 ? ($last_sm_quantity_is_usable >= 0 ? $this->l('Usable') : $this->l('Not usable')) : $this->l('N/A'))),
),
array(
'type' => 'radio',
@@ -245,7 +245,7 @@ class AdminStockManagementControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Is this quantity usable for sale on shops, or reserved in the warehouse for other purposes?')
'desc' => $this->l('Is this quantity ready to be displayed in your shop, or is it reserved in the warehouse for other purposes?')
),
array(
'type' => 'select',
@@ -257,7 +257,7 @@ class AdminStockManagementControllerCore extends AdminController
'id' => 'id_warehouse',
'name' => 'name'
),
'desc' => $this->l('Select the warehouse where you want to add the product into')
'desc' => $this->l('Please select the warehouse that you\'ll be adding products to. ')
),
array(
'type' => 'text',
@@ -279,7 +279,7 @@ class AdminStockManagementControllerCore extends AdminController
'id' => 'id_currency',
'name' => 'name'
),
'desc' => $this->l('The currency associated to the product unit price'),
'desc' => $this->l('The currency associated to the product unit price.'),
),
array(
'type' => 'select',
@@ -307,7 +307,7 @@ class AdminStockManagementControllerCore extends AdminController
case 'removestock' :
$this->fields_form[]['form'] = array(
'legend' => array(
'title' => $this->l('Remove product from stock'),
'title' => $this->l('Remove the product from your stock.'),
'image' => '../img/admin/remove_stock.png'
),
'input' => array(
@@ -388,7 +388,7 @@ class AdminStockManagementControllerCore extends AdminController
'id' => 'id_warehouse',
'name' => 'name'
),
'desc' => $this->l('Select the warehouse from where you want to remove the product')
'desc' => $this->l('Select the warehouse you\'d like to remove the product from.')
),
array(
'type' => 'select',
@@ -415,7 +415,7 @@ class AdminStockManagementControllerCore extends AdminController
case 'transferstock' :
$this->fields_form[]['form'] = array(
'legend' => array(
'title' => $this->l('Transfer product from one warehouse to another'),
'title' => $this->l('Transfer a product from one warehouse to another'),
'image' => '../img/admin/transfer_stock.png'
),
'input' => array(
@@ -475,11 +475,11 @@ class AdminStockManagementControllerCore extends AdminController
'id' => 'id_warehouse',
'name' => 'name'
),
'desc' => $this->l('Select the warehouse from which you want to transfer the product.')
'desc' => $this->l('Select the warehouse you\'d like to transfer the product from.')
),
array(
'type' => 'radio',
'label' => $this->l('Usable for sale in source warehouse?'),
'label' => $this->l('Is this product usable in your source warehouse?'),
'name' => 'usable_from',
'required' => true,
'class' => 't',
@@ -496,7 +496,7 @@ class AdminStockManagementControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Is this a usable quantity for sale?')
'desc' => $this->l('Is this the usable quantity for sale?')
),
array(
'type' => 'select',
@@ -508,11 +508,11 @@ class AdminStockManagementControllerCore extends AdminController
'id' => 'id_warehouse',
'name' => 'name'
),
'desc' => $this->l('Select the warehouse to which to transfer the product.')
'desc' => $this->l('Select the warehouse you\'d like to transfer your product(s) to. ')
),
array(
'type' => 'radio',
'label' => $this->l('Usable for sale in destination warehouse?'),
'label' => $this->l('Is this product for sale in your destination warehouse?'),
'name' => 'usable_to',
'required' => true,
'class' => 't',
@@ -529,7 +529,7 @@ class AdminStockManagementControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Do you want it to be usable for sale?')
'desc' => $this->l('Do you want it to be for sale/useable?')
),
),
'submit' => array(
@@ -786,19 +786,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 a product');
}
if (Tools::isSubmit('removestock'))
{
$this->display = 'removestock';
$this->toolbar_title = $this->l('Stock: Remove product');
$this->toolbar_title = $this->l('Stock: Remove a product');
}
if (Tools::isSubmit('transferstock'))
{
$this->display = 'transferstock';
$this->toolbar_title = $this->l('Stock: Transfer product');
$this->toolbar_title = $this->l('Stock: Transfer a product');
}
}
@@ -952,7 +952,7 @@ class AdminStockManagementControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to using this feature.');
return false;
}
@@ -1148,7 +1148,7 @@ class AdminStockManagementControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to using this feature.');
return false;
}
parent::initProcess();
controllers/admin/AdminStockMvtController.php
+3 -3
View File
@@ -187,7 +187,7 @@ class AdminStockMvtControllerCore 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.'));
}
return $list;
@@ -297,7 +297,7 @@ class AdminStockMvtControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initContent();
@@ -307,7 +307,7 @@ class AdminStockMvtControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initProcess();
controllers/admin/AdminStoresController.php
+4 -4
View File
@@ -238,7 +238,7 @@ class AdminStoresControllerCore extends AdminController
),
array(
'type' => 'text',
'label' => $this->l('E-mail address'),
'label' => $this->l('Email address'),
'name' => 'email',
'size' => 33
),
@@ -434,14 +434,14 @@ class AdminStoresControllerCore extends AdminController
$formFields = array(
'PS_SHOP_NAME' => array(
'title' => $this->l('Shop name'),
'desc' => $this->l('Displayed in e-mails and page titles'),
'desc' => $this->l('Displayed in emails and page titles'),
'validation' => 'isGenericName',
'required' => true,
'size' => 30,
'type' => 'text'
),
'PS_SHOP_EMAIL' => array('title' => $this->l('Shop e-mail'),
'desc' => $this->l('Displayed in e-mails sent to customers'),
'PS_SHOP_EMAIL' => array('title' => $this->l('Shop email'),
'desc' => $this->l('Displayed in emails sent to customers'),
'validation' => 'isEmail',
'required' => true,
'size' => 30,
controllers/admin/AdminSuppliersController.php
+6 -6
View File
@@ -68,7 +68,7 @@ class AdminSuppliersControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Suppliers'),
'title' => $this->l('Suppliers:'),
'image' => '../img/admin/suppliers.gif'
),
'input' => array(
@@ -92,7 +92,7 @@ class AdminSuppliersControllerCore extends AdminController
'rows' => 10,
'lang' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'desc' => $this->l('Will appear in supplier list')
'desc' => $this->l('Will appear in the supplier list')
),
array(
'type' => 'text',
@@ -100,7 +100,7 @@ class AdminSuppliersControllerCore extends AdminController
'name' => 'phone',
'size' => 15,
'maxlength' => 16,
'desc' => $this->l('Phone number of this supplier')
'desc' => $this->l('Phone number for this supplier')
),
array(
'type' => 'text',
@@ -161,7 +161,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Logo:'),
'name' => 'logo',
'display_image' => true,
'desc' => $this->l('Upload supplier logo from your computer')
'desc' => $this->l('Upload a supplier logo from your computer')
),
array(
'type' => 'text',
@@ -183,7 +183,7 @@ class AdminSuppliersControllerCore extends AdminController
'name' => 'meta_keywords',
'lang' => true,
'hint' => $this->l('Forbidden characters:').' <>;=#{}',
'desc' => $this->l('To add "tags" click in the field, write something, then press "Enter"')
'desc' => $this->l('To add "tags" click in the field, write something and then press "Enter"')
),
array(
'type' => 'radio',
@@ -399,7 +399,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 are any pending supplier orders.');
$this->errors[] = $this->l('It is not possible to delete a supplier if there are pending supplier orders.');
else
{
//delete all product_supplier linked to this supplier
controllers/admin/AdminSupplyOrdersController.php
+30 -30
View File
@@ -140,7 +140,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
$this->display = 'edit';
else
$this->errors[] = Tools::displayError($this->l('You do not have permission to edit here.'));
$this->errors[] = Tools::displayError($this->l('You do not have permission to edit this.'));
}
if (Tools::isSubmit('update_receipt') && Tools::isSubmit('id_supply_order'))
@@ -166,10 +166,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 a 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 orders');
if (Tools::isSubmit('mod') && Tools::getValue('mod') === 'template' || $this->object->is_template)
$this->toolbar_title .= ' ('.$this->l('template').')';
@@ -212,7 +212,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
'name' => 'reference',
'size' => 50,
'required' => true,
'desc' => $this->l('This is the reference for your order.'),
'desc' => $this->l('Here\'s the reference number for your order.'),
),
array(
'type' => 'select',
@@ -224,8 +224,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
'id' => 'id_supplier',
'name' => 'name'
),
'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.')
'desc' => $this->l('Select the supplier you\'ll be purchasing from.'),
'hint' => $this->l('Warning: All products already added to the order will be removed.')
),
array(
'type' => 'select',
@@ -237,7 +237,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
'id' => 'id_warehouse',
'name' => 'name'
),
'desc' => $this->l('Select the warehouse to which you want the order to be sent.'),
'desc' => $this->l('Which warehouse will the order be sent to?'),
),
array(
'type' => 'select',
@@ -250,7 +250,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('Warning: All products already added to the order will be removed.')
),
array(
'type' => 'select',
@@ -279,7 +279,7 @@ 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 than or equal to this value will be loaded.'),
'desc' => $this->l('If specified, each product quantity less than or equal to this value will be loaded.'),
),
),
'submit' => array(
@@ -309,7 +309,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
'name' => 'date_delivery_expected',
'size' => 10,
'required' => true,
'desc' => $this->l('This is the expected delivery date for this order.'),
'desc' => $this->l('The expected delivery date for this order is...'),
);
}
@@ -327,14 +327,14 @@ class AdminSupplyOrdersControllerCore extends AdminController
}
$this->displayInformation(
$this->l('Please note that if you wish to order products, they have to be available for the specified Supplier/Warehouse.')
$this->l('If you wish to order products, they have to be available for the specified supplier/warehouse.')
.' '.
$this->l('See Catalog/Products/Your Product/Suppliers & Warehouses')
.'<br />'.
$this->l('Also, changing the currency or the supplier will reset the order.')
$this->l('Changing the currency or the supplier will reset the order.')
.'<br />'
.'<br />'.
$this->l('Finally, please note that you can only order from one supplier at a time.')
$this->l('Please note that you can only order from one supplier at a time.')
);
return parent::renderForm();
}
@@ -371,7 +371,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
{
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
}
}
@@ -417,10 +417,10 @@ 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 use later to generate actual orders.').'<br />');
$this->displayInformation($this->l('You can create templates 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'));
$this->displayWarning($this->l('You must choose at least one warehouse before creating supply orders. For more information, see Stock/Warehouses.'));
// assigns warehouses
$this->tpl_list_vars['warehouses'] = $this->warehouses;
@@ -574,12 +574,12 @@ class AdminSupplyOrdersControllerCore extends AdminController
// defines the fields of the form to display
$this->fields_form[]['form'] = array(
'legend' => array(
'title' => $this->l('Supply Order Status'),
'title' => $this->l('Supply order status'),
'image' => '../img/admin/cms.gif'
),
);
$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 those changes cannot be canceled. '));
// sets up the helper
$helper = new HelperForm();
@@ -826,8 +826,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
// display these global order informations
$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 />');
$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('A green line means that you\'ve received what you expected. A red line means that you\'ve received more than expected.').'<br />');
// generates content
$content = $helper->generateList($this->_list, $this->fields_list);
@@ -1122,7 +1122,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
// get supply order ID
$id_supply_order = (int)Tools::getValue('id_supply_order', 0);
if ($id_supply_order <= 0)
$this->errors[] = Tools::displayError($this->l('The supply order id is not valid.'));
$this->errors[] = Tools::displayError($this->l('The supply order ID is not valid.'));
if (!count($this->errors))
{
@@ -1146,7 +1146,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
// special case of validate state - check if there are products in the order and the required state is not an enclosed state
if ($supply_order->isEditable() && !$supply_order->hasEntries() && !$new_state->enclosed)
$this->errors[] = Tools::displayError(
$this->l('It is not possible to change the status of this order because you did not order any products')
$this->l('It is not possible to change the status of this order because you did not order any products.')
);
if (!count($this->errors))
@@ -1298,7 +1298,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$rows = Tools::getValue('supply_order_detailBox');
if (!$rows)
{
$this->errors[] = Tools::displayError($this->l('You did not select any product to update'));
$this->errors[] = Tools::displayError($this->l('You did not select any products to update.'));
return;
}
@@ -1314,7 +1314,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
// checks if there is something to update
if (!count($to_update))
{
$this->errors[] = Tools::displayError($this->l('You did not select any product to update'));
$this->errors[] = Tools::displayError($this->l('You did not select any products to update.'));
return;
}
@@ -1351,7 +1351,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$warehouse = new Warehouse($supply_order->id_warehouse);
if (!Validate::isLoadedObject($warehouse))
{
$this->errors[] = Tools::displayError($this->l('Warehouse could not be loaded'));
$this->errors[] = Tools::displayError($this->l('The warehouse could not be loaded.'));
return;
}
@@ -1385,7 +1385,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$supply_order->save();
}
else
$this->errors[] = Tools::displayError($this->l('Something went wrong when adding products to the warehouse'));
$this->errors[] = Tools::displayError($this->l('Something went wrong when adding products to the warehouse.'));
}
}
}
@@ -1408,7 +1408,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 ongoing receipt of products');
self::$cache_lang['Receipt'] = $this->l('Update ongoing receipt of products.');
$this->context->smarty->assign(array(
'href' => self::$currentIndex.
@@ -1450,7 +1450,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
public function displayCreateSupplyOrderLink($token = null, $id)
{
if (!array_key_exists('CreateSupplyOrder', self::$cache_lang))
self::$cache_lang['CreateSupplyOrder'] = $this->l('Use this template to create a supply order');
self::$cache_lang['CreateSupplyOrder'] = $this->l('Use this template to create a supply order.');
if (!array_key_exists('CreateSupplyOrderConfirm', self::$cache_lang))
self::$cache_lang['CreateSupplyOrderConfirm'] = $this->l('Are you sure you want to use this template?');
@@ -1695,9 +1695,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 information on your order.').'<br />');
$this->displayInformation($this->l('This interface allows you to display detailed information about your order.').'<br />');
else
$this->displayInformation($this->l('This interface allows you to display detailed information on your order template.').'<br />');
$this->displayInformation($this->l('This interface allows you to display detailed information about your order template.').'<br />');
$lang_id = (int)$supply_order->id_lang;
controllers/admin/AdminTabsController.php
+1 -1
View File
@@ -135,7 +135,7 @@ class AdminTabsControllerCore extends AdminController
'type' => 'file',
'label' => $this->l('Icon:'),
'name' => 'icon',
'desc' => $this->l('Upload logo from your computer (.gif, .jpg, .jpeg or .png).')
'desc' => $this->l('Upload a logo from your computer (.gif, .jpg, .jpeg or .png).')
),
array(
'type' => 'radio',
controllers/admin/AdminTagsController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class AdminTagsControllerCore extends AdminController
'filter_key' => 'a!name'
),
'products' => array(
'title' => $this->l('Products'),
'title' => $this->l('Products:'),
'align' => 'right',
'havingFilter' => true
)
controllers/admin/AdminTaxRulesGroupController.php
+6 -6
View File
@@ -95,7 +95,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'width' => 140
),
'zipcode' => array(
'title' => $this->l('Zip Codes'),
'title' => $this->l('Zip Code'),
'width' => 25,
),
'behavior' => array(
@@ -191,7 +191,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->no_back = true;
$this->toolbar_btn['new'] = array(
'href' => '#',
'desc' => $this->l('Add new tax rule')
'desc' => $this->l('Add a new tax rule')
);
$content = parent::renderForm();
$this->tpl_folder = 'tax_rules/';
@@ -257,7 +257,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'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')
'hint' => $this->l('You can define a range of zipcodes (eg: 75000-75015) or simply use one zipcode.')
),
array(
'type' => 'select',
@@ -276,7 +276,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
),
array(
'id' => 2,
'name' => $this->l('One After Another')
'name' => $this->l('One after another')
)
),
'id' => 'id',
@@ -285,8 +285,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'hint' =>
$this->l('Define the behavior if an address matches multiple rules:').'<br />
<b>'.$this->l('This Tax Only:').'</b> '.$this->l('Will apply only this tax').'<br />
<b>'.$this->l('Combine:').'</b> '.$this->l('Combine taxes (eg: 10% + 5% => 15%)').'<br />
<b>'.$this->l('One After Another:').'</b> '.$this->l('Apply taxes one after another (eg: 100€ + 10% => 110€ + 5% => 115.5€)')
<b>'.$this->l('Combine:').'</b> '.$this->l('Combine taxes (eg: 10% + 5% = 15%)').'<br />
<b>'.$this->l('One After Another:').'</b> '.$this->l('Apply taxes one after another (eg: 0 + 10% = 0 + 5% = 5.5)')
),
array(
'type' => 'select',
controllers/admin/AdminTaxesController.php
+9 -9
View File
@@ -49,7 +49,7 @@ class AdminTaxesControllerCore extends AdminController
$ecotax_desc = '';
if (Configuration::get('PS_USE_ECOTAX'))
$ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0');
$ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0.');
$this->fields_options = array(
'general' => array(
@@ -60,12 +60,12 @@ class AdminTaxesControllerCore extends AdminController
'desc' => $this->l('Select whether or not to include tax on purchases'),
'cast' => 'intval', 'type' => 'bool'),
'PS_TAX_DISPLAY' => array(
'title' => $this->l('Display tax in cart:'),
'desc' => $this->l('Select whether or not to display tax on a distinct line in the cart'),
'title' => $this->l('Display tax in the shopping cart:'),
'desc' => $this->l('Select whether or not to display tax on a distinct line in the cart.'),
'cast' => 'intval',
'type' => 'bool'),
'PS_TAX_ADDRESS_TYPE' => array(
'title' => $this->l('Base on:'),
'title' => $this->l('Based on:'),
'cast' => 'pSQL',
'type' => 'select',
'list' => array(
@@ -94,7 +94,7 @@ class AdminTaxesControllerCore extends AdminController
if (Configuration::get('PS_USE_ECOTAX'))
$this->fields_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%).'),
'desc' => $this->l('Define the ecotax (e.g. French ecotax: 19.6%).'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_tax',
@@ -117,7 +117,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 you would like to continue?');
$confirm = $this->l('This tax is currently in use as tax rule. Are you sure you\'d like to continue?');
$this->context->smarty->assign(array(
'href' => self::$currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token),
@@ -141,7 +141,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 you would like to continue?');
$confirm = $this->l('This tax is currently in use as a tax rule. If you continue, this tax will be removed from the tax rule. Are you sure you\'d like to continue?');
$tpl_enable = $this->context->smarty->createTemplate('helpers/list/list_action_enable.tpl');
$tpl_enable->assign(array(
@@ -158,7 +158,7 @@ class AdminTaxesControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Taxes'),
'title' => $this->l('Taxes:'),
'image' => '../img/admin/dollar.gif'
),
'input' => array(
@@ -170,7 +170,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 carts and on invoices (e.g. VAT).')
),
array(
'type' => 'text',
controllers/admin/AdminThemesController.php
+19 -19
View File
@@ -104,8 +104,8 @@ class AdminThemesControllerCore extends AdminController
$this->fields_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 from the above list if you want to select a theme') : '',
'title' => sprintf($this->l('Select a theme for shop %s'), $this->context->shop->name),
'description' => (!$this->can_display_themes) ? $this->l('You must select a shop from the above list if you wish to choose a theme.') : '',
'fields' => array(
'theme_for_shop' => array(
'type' => 'theme',
@@ -137,51 +137,51 @@ 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 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'),
((Configuration::get('PS_LOGO_MAIL') === false) ? '<span class="light-warning">'.$this->l('Warning: No email logo has been indentified. The header logo will be used instead.').'</span><br />' : '').
$this->l('Will appear on email 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()
),
'PS_LOGO_INVOICE' => array(
'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 invoice headers. If undefined, the Header logo will be used'),
((Configuration::get('PS_LOGO_INVOICE') === false) ? '<span class="light-warning">'.$this->l('Warning: No invoice logo has been defined. The header logo will be used instead.').'</span><br />' : '').
$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()
),
'PS_FAVICON' => array(
'title' => $this->l('Favicon'),
'hint' => $this->l('Only ICO format allowed'),
'desc' => $this->l('Will appear in the address bar of your web browser'),
'desc' => $this->l('Will appear in the address bar of your web browser.'),
'type' => 'file',
'thumb' => _PS_IMG_.Configuration::get('PS_FAVICON').'?date='.time()
),
'PS_STORES_ICON' => array(
'title' => $this->l('Store icon'),
'hint' => $this->l('Only GIF format allowed'),
'desc' => $this->l('Will appear on the store locator (inside Google Maps)').'<br />'.$this->l('Suggested size: 30x30, Transparent GIF'),
'hint' => $this->l('Only GIF format allowed.'),
'desc' => $this->l('Will appear on the store locator (inside Google Maps).').'<br />'.$this->l('Suggested size: 30x30, Transparent GIF'),
'type' => 'file',
'thumb' => _PS_IMG_.Configuration::get('PS_STORES_ICON').'?date='.time()
),
'PS_NAVIGATION_PIPE' => array(
'title' => $this->l('Navigation pipe'),
'desc' => $this->l('Used for navigation path inside categories/product'),
'desc' => $this->l('Used for the navigation path inside categories/product.'),
'cast' => 'strval',
'type' => 'text',
'size' => 20
),
'PS_ALLOW_MOBILE_DEVICE' => array(
'title' => $this->l('Enable mobile theme'),
'desc' => $this->l('Allows visitors browsing on a mobile device or on a touchpad, to have a light version of website'),
'title' => $this->l('Enable the mobile theme.'),
'desc' => $this->l('Allows visitors browsing on mobile devices to view a lighter version of your website.'),
'type' => 'radio',
'required' => true,
'validation' => 'isGenericName',
'choices' => array(
0 => $this->l('I want to disable it'),
1 => $this->l('I want to enable it only on mobiles devices'),
2 => $this->l('I want to enable it only on touchpads'),
3 => $this->l('I want to enable it on mobile and touchpad devices')
0 => $this->l('I\'d like to disable it, please. '),
1 => $this->l('I\'d like to enable it only on smart phones.'),
2 => $this->l('I\'d like to enable it only on tablets.'),
3 => $this->l('I\'d like to enable it on both smart phones and tablets.')
)
),
'PS_MAIL_COLOR' => array(
@@ -285,7 +285,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.'),
'desc' => $this->l('If you create a new theme, it\'s recommended that you use default theme files.'),
'options' => array(
'id' => 'id', 'name' => 'name',
'default' => array('value' => 0, 'label' => '&nbsp;-&nbsp;'),
@@ -361,7 +361,7 @@ class AdminThemesControllerCore extends AdminController
{
$res &= mkdir(_PS_ALL_THEMES_DIR_.$new_dir, Theme::$access_rights);
if ($res)
$this->confirmations[] = $this->l('Directory successfully created');
$this->confirmations[] = $this->l('The directory was successfully created.');
}
if (0 !== $id_based = (int)Tools::getValue('based_on'))
@@ -384,7 +384,7 @@ class AdminThemesControllerCore extends AdminController
if ($obj && $obj->isUsed())
{
$this->errors[] = $this->l('This theme is already used by at least one shop. Please choose another theme first.');
$this->errors[] = $this->l('The theme is already being used by at least one shop. Please choose another theme before continuing.');
return false;
}
controllers/admin/AdminTrackingController.php
+1 -1
View File
@@ -149,7 +149,7 @@ class AdminTrackingControllerCore extends AdminController
AND IFNULL(stock.quantity, 0) <= 0
)';
$this->tpl_list_vars = array('sub_title' => $this->l('List of products with attributes and without available quantities for sale:'));
$this->tpl_list_vars = array('sub_title' => $this->l('List of products with attributes but without available quantities for sale:'));
controllers/admin/AdminTranslationsController.php
+15 -15
View File
@@ -254,7 +254,7 @@ class AdminTranslationsControllerCore extends AdminController
if (!mkdir($path, 0777, true))
{
$bool &= false;
$this->errors[] = sprintf($this->l('Cannot create the folder "%s". Check directory writing permisions.'), $path);
$this->errors[] = sprintf($this->l('Cannot create the folder "%s". Please check your directory writing permisions.'), $path);
}
return $bool;
@@ -330,13 +330,13 @@ class AdminTranslationsControllerCore extends AdminController
public function submitCopyLang()
{
if (!($from_lang = Tools::getValue('fromLang')) || !($to_lang = 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 two languages in order to copy data from one to another.');
else if (!($from_theme = Tools::getValue('fromTheme')) || !($to_theme = 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 two 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('There is nothing to copy (same language and theme).');
else
{
$theme_exists = array('from_theme' => false, 'to_theme' => false);
@@ -365,7 +365,7 @@ class AdminTranslationsControllerCore extends AdminController
}
if ($bool)
$this->redirect(false, 14);
$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 of the language files could not be found.');
}
/**
@@ -1137,7 +1137,7 @@ class AdminTranslationsControllerCore extends AdminController
)
),
'mails' => array(
'name' => $this->l('E-mail template translations'),
'name' => $this->l('Email template translations'),
'var' => '_LANGMAIL',
'dir' => _PS_MAIL_DIR_.$this->lang_selected->iso_code.'/',
'file' => 'lang.php',
@@ -1529,8 +1529,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 in Google Translate\'s 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'))
);
}
@@ -1783,7 +1783,7 @@ class AdminTranslationsControllerCore extends AdminController
{
if (empty($english_string))
{
$this->errors[] = sprintf($this->l('Error in template - Empty string found, please edit: "%s"'), $file_path);
$this->errors[] = sprintf($this->l('There\'s an error in template, an empty string has been found. Please edit: "%s"'), $file_path);
$new_lang[$english_string] = '';
}
else
@@ -2154,7 +2154,7 @@ class AdminTranslationsControllerCore extends AdminController
{
$str_return .= '
<div class="label-subject">
<b>'.sprintf($this->l('No Subject was found for %s, or subject is generated in database.'), '<em>'.$mail_name.'</em>').'</b>
<b>'.sprintf($this->l('No Subject was found for %s in the database.'), '<em>'.$mail_name.'</em>').'</b>
</div>';
}
if (array_key_exists('html', $mail_files))
@@ -2172,7 +2172,7 @@ class AdminTranslationsControllerCore extends AdminController
else
{
$str_return .= '
<p class="error">'.$this->l('There is a problem getting the Mail files.').'<br />'
<p class="error">'.$this->l('There was a problem getting the mail files.').'<br />'
.sprintf($this->l('Please ensure that English files exist in %s folder'), '<em>'.$mails['directory'].'en</em>')
.'</p>';
}
@@ -2251,7 +2251,7 @@ class AdminTranslationsControllerCore extends AdminController
</div><!-- .label-subject -->';
$str_return .= '
<iframe style="background:white;border:1px solid #DFD5C3;" border="0" src ="'.$url.'?'.(rand(0, 1000000000)).'" 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 e-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 email template.').'</a>
</div>
<textarea style="display:none;" class="rte mailrte" cols="80" rows="30" name="'.$group_name.'[html]['.$name_for_module.$mail_name.']">'.$content[$lang].'</textarea>
</div><!-- .mail-form -->
@@ -2339,7 +2339,7 @@ class AdminTranslationsControllerCore extends AdminController
{
$module_mails[$module_name] = $this->getMailFiles($module_path.'mails/'.$this->lang_selected->iso_code.'/', 'module_mail');
$module_mails[$module_name]['subject'] = $core_mails['subject'];
$module_mails[$module_name]['display'] = $this->displayMailContent($module_mails[$module_name], $subject_mail, $this->lang_selected, Tools::strtolower($module_name), sprintf($this->l('E-mails for %s module'), '<em>'.$module_name.'</em>'), $module_name);
$module_mails[$module_name]['display'] = $this->displayMailContent($module_mails[$module_name], $subject_mail, $this->lang_selected, Tools::strtolower($module_name), sprintf($this->l('Emails for %s module'), '<em>'.$module_name.'</em>'), $module_name);
}
if ($no_display)
@@ -2359,7 +2359,7 @@ class AdminTranslationsControllerCore extends AdminController
$this->tpl_view_vars = array_merge($this->tpl_view_vars, array(
'limit_warning' => $this->displayLimitPostWarning($this->total_expression),
'tinyMCE' => $this->getTinyMCEForMails($this->lang_selected->iso_code),
'mail_content' => $this->displayMailContent($core_mails, $subject_mail, $this->lang_selected, 'core', $this->l('Core e-mails')),
'mail_content' => $this->displayMailContent($core_mails, $subject_mail, $this->lang_selected, 'core', $this->l('Core emails')),
'module_mails' => $module_mails,
'theme_name' => $this->theme_selected
));
controllers/admin/AdminWarehousesController.php
+14 -14
View File
@@ -105,12 +105,12 @@ 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('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 overall value, the number of products and quantities stored, etc.')
$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the default currency used.').'<br />');
$this->displayInformation($this->l('You should also check:'));
$this->displayInformation($this->l('the management type (according to the law in your country), the valuation currency and its associated carriers and shops.').'<br />');
$this->displayInformation($this->l('You can also see detailed information about your stock, 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.'));
$this->displayInformation($this->l('Be careful! Products from different warehouses will need to be shipped in different packages.'));
return parent::renderList();
}
@@ -134,9 +134,9 @@ class AdminWarehousesControllerCore extends AdminController
// sets the title of the toolbar
if (Tools::isSubmit('add'.$this->table))
$this->toolbar_title = $this->l('Stock: create warehouse');
$this->toolbar_title = $this->l('Stock: Create a warehouse');
else
$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(
@@ -219,7 +219,7 @@ class AdminWarehousesControllerCore extends AdminController
'id' => 'id_country',
'name' => 'name',
),
'desc' => $this->l('Country where the state, region or city is located')
'desc' => $this->l('Warehouse location country')
),
array(
'type' => 'select',
@@ -255,7 +255,7 @@ class AdminWarehousesControllerCore extends AdminController
'name' => 'name'
),
'desc' => $this->l('Associated carriers. Use CTRL+CLICK to select several.'),
'hint' => $this->l('You can specify the carriers available to ship orders from this warehouse'),
'hint' => $this->l('You can specify the number of carriers available to ship orders from particular warehouses.'),
),
),
@@ -280,7 +280,7 @@ 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('Be careful! You won\'t be able to change this value later!'),
'name' => 'management_type',
'required' => true,
'options' => array(
@@ -308,7 +308,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('Be careful! You won\'t be able to change this value later!'),
'name' => 'id_currency',
'required' => true,
'options' => array(
@@ -470,7 +470,7 @@ class AdminWarehousesControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initContent();
@@ -480,7 +480,7 @@ class AdminWarehousesControllerCore extends AdminController
{
if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management prior to use this feature.');
$this->warnings[md5('PS_ADVANCED_STOCK_MANAGEMENT')] = $this->l('You need to activate advanced stock management before using this feature.');
return false;
}
parent::initProcess();
@@ -557,7 +557,7 @@ class AdminWarehousesControllerCore extends AdminController
if (!($obj = $this->loadObject(true)))
return;
else if ($obj->getQuantitiesOfProducts() > 0) // not possible : products
$this->errors[] = $this->l('It is not possible to delete a Warehouse when there are products in it.');
$this->errors[] = $this->l('It is not possible to delete a warehouse when there are products in it.');
else if (SupplyOrder::warehouseHasPendingOrders($obj->id)) // not possible : supply orders
$this->errors[] = $this->l('It is not possible to delete a Warehouse if it has pending supply orders.');
else // else, it can be deleted
controllers/admin/AdminWebserviceController.php
+13 -13
View File
@@ -70,17 +70,17 @@ class AdminWebserviceControllerCore extends AdminController
'general' => array(
'title' => $this->l('Configuration'),
'fields' => array(
'PS_WEBSERVICE' => array('title' => $this->l('Enable PrestaShop Webservice'),
'PS_WEBSERVICE' => array('title' => $this->l('Enable PrestaShop\'s webservice'),
'desc' => $this->l('Before activating the webservice, you must be sure to: ').
'<ol>
<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>
<li>'.$this->l('Check that URL rewriting is available on this server').'</li>
<li>'.$this->l('Check that the five methods GET, POST, PUT, DELETE and HEAD are supported by this server.').'</li>
</ol>',
'cast' => 'intval',
'type' => 'bool'),
'PS_WEBSERVICE_CGI_HOST' => array(
'title' => $this->l('Active mode CGI for PHP'),
'desc' => $this->l('Be sure PHP is not configured as an Apache module on your server'),
'title' => $this->l('Active mode CGI for PHP.'),
'desc' => $this->l('Be sure PHP is not configured as an Apache module on your server.'),
'cast' => 'intval',
'type' => 'bool'
),
@@ -113,7 +113,7 @@ class AdminWebserviceControllerCore extends AdminController
'id' => 'code',
'size' => 32,
'required' => true,
'desc' => $this->l('Webservice account key'),
'desc' => $this->l('Webservice account key.'),
),
array(
'type' => 'textarea',
@@ -161,7 +161,7 @@ class AdminWebserviceControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -220,9 +220,9 @@ class AdminWebserviceControllerCore extends AdminController
public function postProcess()
{
if (Tools::getValue('key') && strlen(Tools::getValue('key')) < 32)
$this->errors[] = Tools::displayError($this->l('Key length must be 32 character long'));
$this->errors[] = Tools::displayError($this->l('Key length must be 32 character long.'));
if (WebserviceKey::keyExists(Tools::getValue('key')) && !Tools::getValue('id_webservice_account'))
$this->errors[] = Tools::displayError($this->l('Key already exists'));
$this->errors[] = Tools::displayError($this->l('This key already exists.'));
return parent::postProcess();
}
@@ -247,17 +247,17 @@ class AdminWebserviceControllerCore extends AdminController
{
$apache_modules = apache_get_modules();
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.');
$this->warnings[] = $this->l('Please activate the Apache module \'mod_auth_basic\' to allow authentication of PrestaShop\'s webservice.');
if (!in_array('mod_rewrite', $apache_modules))
$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. Please manually check if they are activated in order to use the PrestaShop webservice.');
$this->warnings[] = $this->l('We could not check to see if basic authentication and rewrite extensions have been activated. Please manually check if they\'ve been activated in order to use the PrestaShop webservice.');
}
if (!extension_loaded('SimpleXML'))
$this->warnings[] = $this->l('Please activate the PHP extension \'SimpleXML\' to allow testing of PrestaShop webservice.');
$this->warnings[] = $this->l('Please activate the PHP extension \'SimpleXML\' to allow testing of PrestaShop\'s webservice.');
if (!configuration::get('PS_SSL_ENABLED'))
$this->warnings[] = $this->l('If possible, it is preferable to use SSL (https) for webservice calls, as it avoids the security issues of type "man in the middle".');
$this->warnings[] = $this->l('It is preferable to use SSL (https:) for webservice calls, as it avoids the "man in the middle" type security issues. ');
foreach ($this->_list as $k => $item)
if ($item['is_module'] && $item['class_name'] && $item['module_name'] &&