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

// Fix replace \\" by " in english keys and change french keys for errors files

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14180 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-03-15 08:31:12 +00:00
parent ff312d3ff4
commit a7a05b7637
14 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImagesController.php
+2 -2
View File
@@ -591,7 +591,7 @@ class AdminImagesControllerCore extends AdminController
$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.');
}