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

// Fix update english key of translations in all files

Browse Source
This commit is contained in:
lLefevre
2012-03-14 12:25:51 +00:00
parent d93eff8834
commit c21bef2acf
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImagesController.php
+18 -18
View File
@@ -53,7 +53,7 @@ class AdminImagesControllerCore extends AdminController
'top' => '',
'bottom' => '',
'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a bigger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').'
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issue, turn it off by selecting "Use JPEG".'),
<br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting \\"Use JPEG\\".'),
'fields' => array(
'PS_IMAGE_QUALITY' => array(
'title' => $this->l('Image quality'),
@@ -82,7 +82,7 @@ class AdminImagesControllerCore extends AdminController
'submit' => array('name' => 'submitImagePreferences'),
),
'product_images' => array(
'title' => $this->l('Products images'),
'title' => $this->l('Product images'),
'fields' => array(
'PS_IMAGE_GENERATION_METHOD' => array(
'title' => $this->l('Image generated by:'),
@@ -118,7 +118,7 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_PRODUCT_PICTURE_WIDTH' => array(
'title' => $this->l('Product pictures width:'),
'title' => $this->l('Product picture width:'),
'desc' => $this->l('The maximum width of pictures uploadable by customers'),
'validation' => 'isUnsignedId',
'required' => true,
@@ -128,7 +128,7 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_PRODUCT_PICTURE_HEIGHT' => array(
'title' => $this->l('Product pictures height:'),
'title' => $this->l('Product picture height:'),
'desc' => $this->l('The maximum height of pictures uploadable by customers'),
'validation' => 'isUnsignedId',
'required' => true,
@@ -162,7 +162,7 @@ class AdminImagesControllerCore extends AdminController
'label' => $this->l('Type name:'),
'name' => 'name',
'required' => true,
'desc' => $this->l('Letters only (e.g., small, medium, large, extra-large)')
'desc' => $this->l('Letters and minus sign (-) only (e.g. small, medium, large, extra-large)')
),
array(
'type' => 'text',
@@ -189,7 +189,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to product images'),
'desc' => $this->l('This type will be used for product images'),
'values' => array(
array(
'id' => 'products_on',
@@ -210,7 +210,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to categories images'),
'desc' => $this->l('This type will be applied to Category images'),
'values' => array(
array(
'id' => 'categories_on',
@@ -231,7 +231,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to manufacturers images'),
'desc' => $this->l('This type will be applied to Manufacturer images'),
'values' => array(
array(
'id' => 'manufacturers_on',
@@ -252,7 +252,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to suppliers images'),
'desc' => $this->l('This type will be used for Supplier images'),
'values' => array(
array(
'id' => 'suppliers_on',
@@ -273,7 +273,7 @@ class AdminImagesControllerCore extends AdminController
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to scenes images'),
'desc' => $this->l('This type will be used for scene images'),
'values' => array(
array(
'id' => 'scenes_on',
@@ -289,12 +289,12 @@ class AdminImagesControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('stores:'),
'label' => $this->l('Stores:'),
'name' => 'stores',
'required' => false,
'class' => 't',
'is_bool' => true,
'desc' => $this->l('This type will be applied to stores images'),
'desc' => $this->l('This type will be used for Store images'),
'values' => array(
array(
'id' => 'stores_on',
@@ -324,9 +324,9 @@ class AdminImagesControllerCore extends AdminController
// When moving images, if duplicate images were found they are moved to a folder named duplicates/
if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
{
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ').
$this->warnings[] = $this->l('Duplicate images were found when moving the product images. It is likely caused by unused demonstration images. Please make sure that the folder ').
_PS_PROD_IMG_DIR_.'duplicates/'.
$this->l(' only contains demonstration images then delete this folder.');
$this->l('only contains demonstration images, and then delete this folder.');
}
if (Tools::getValue('submitRegenerate'.$this->table))
@@ -581,17 +581,17 @@ class AdminImagesControllerCore extends AdminController
if ($deleteOldImages)
$this->_deleteOldImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false));
if (($return = $this->_regenerateNewImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false))) === true)
$this->errors[] = Tools::displayError('Cannot write ').$proc['type'].Tools::displayError(' images. Please check the folder\'s writing permissions.');
$this->errors[] = Tools::displayError('Cannot write').$proc['type'].Tools::displayError('images. Please check the folder\'s writing permissions.');
elseif ($return == 'timeout')
$this->errors[] = Tools::displayError('Only part of the images have been regenerated, server timed out before finishing.');
else
{
if ($proc['type'] == 'products')
if ($this->_regenerateWatermark($proc['dir']) == 'timeout')
$this->errors[] = Tools::displayError('Server timed out, the watermark may not have been applied on all your images.');
$this->errors[] = Tools::displayError('Server timed out, the watermark may not have been applied to all images.');
if (!count($this->errors))
if ($this->_regenerateNoPictureImages($proc['dir'], $formats, $languages))
$this->errors[] = Tools::displayError('Cannot write no-picture image to').' ('.$proc['type'].') '.Tools::displayError('images folder. Please check the folder\'s writing permissions.');
$this->errors[] = Tools::displayError('Cannot write \\"No picture\\" image to').' ('.$proc['type'].') '.Tools::displayError('images folder. Please check the folder\'s writing permissions.');
}
}
return (count($this->errors) > 0 ? false : true);
@@ -621,7 +621,7 @@ class AdminImagesControllerCore extends AdminController
$this->max_execution_time = (int)ini_get('max_execution_time');
$result = Image::moveToNewFileSystem($this->max_execution_time);
if ($result === 'timeout')
$this->errors[] = Tools::displayError('Not all images have been moved, server timed out before finishing. Click on \"Move images\" again to resume moving images');
$this->errors[] = Tools::displayError('Not all images have been moved, server timed out before finishing. Click on \\"Move images\\" again to resume moving images');
else if ($result === false)
$this->errors[] = Tools::displayError('Error: some or all images could not be moved.');
}