Merge pull request #366 from lunika/image_upload

Image upload

core/lib/Thelia/Config/I18n/en_US.php

@@ -67,6 +67,7 @@ return array(
     'Failed to update language definition: %ex' => 'Failed to update language definition: %ex',
     'Fax' => 'Fax',
     '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',
     'Firstname' => 'Firstname',
     'Folder title *' => 'Folder title *',

core/lib/Thelia/Controller/Admin/FileController.php

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