TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #366 from lunika/image_upload

Browse Source 
Image upload
This commit is contained in:
Manuel Raynaud
2014-04-30 14:31:24 +02:00
parent fc130f295a 2ce1c79653
commit ba08271519
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Config/I18n/en_US.php
View File

@@ -67,6 +67,7 @@ return array(
'Failed to update language definition: %ex' => 'Failed to update language definition: %ex', 'Failed to update language definition: %ex' => 'Failed to update language definition: %ex',
'Fax' => 'Fax', 'Fax' => 'Fax',
'Feature value does not match FLOAT format' => 'Feature value does not match FLOAT format', 'Feature value does not match FLOAT format' => 'Feature value does not match FLOAT format',
'File is too heavy, please retry with a file having a size less than %size%.' => 'File is too Large, please retry with a file having a size less than %size%.',
'First Name' => 'First Name', 'First Name' => 'First Name',
'Firstname' => 'Firstname', 'Firstname' => 'Firstname',
'Folder title *' => 'Folder title *', 'Folder title *' => 'Folder title *',

4
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -77,8 +77,8 @@ class FileController extends BaseAdminController
$message = $this->getTranslator() $message = $this->getTranslator()
->trans( ->trans(
'File is too heavy, please retry with a file having a size less than %size%.', 'File is too heavy, please retry with a file having a size less than %size%.',
array('%size%' => ini_get('post_max_size')), array('%size%' => ini_get('upload_max_filesize')),
'image' 'core'
); );
return new ResponseRest($message, 'text', 403); return new ResponseRest($message, 'text', 403);