|
16 | 16 |
|
17 | 17 | class UploadController extends AbstractController |
18 | 18 | { |
| 19 | + private $translator; |
| 20 | + |
| 21 | + public function __construct(Translator $translator) |
| 22 | + { |
| 23 | + $this->translator = $translator; |
| 24 | + } |
| 25 | + |
19 | 26 | /** |
20 | 27 | * Save uploaded image according to comur_image field configuration |
21 | 28 | * |
22 | 29 | * @param Request $request |
23 | 30 | */ |
24 | | - public function uploadImageAction(Request $request, Translator $translator |
| 31 | + public function uploadImageAction(Request $request |
25 | 32 | /*, $uploadUrl, $paramName, $webDir, $minWidth=1, $minHeight=1*/ |
26 | 33 | ){ |
27 | 34 | $config = json_decode($request->request->get('config'),true); |
@@ -84,24 +91,24 @@ public function uploadImageAction(Request $request, Translator $translator |
84 | 91 | $transDomain = $this->container->getParameter('comur_image.translation_domain'); |
85 | 92 |
|
86 | 93 | $errorMessages = array( |
87 | | - 1 => $translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain), |
88 | | - 2 => $translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain), |
89 | | - 3 => $translator->trans('The uploaded file was only partially uploaded', array(), $transDomain), |
90 | | - 4 => $translator->trans('No file was uploaded', array(), $transDomain), |
91 | | - 6 => $translator->trans('Missing a temporary folder', array(), $transDomain), |
92 | | - 7 => $translator->trans('Failed to write file to disk', array(), $transDomain), |
93 | | - 8 => $translator->trans('A PHP extension stopped the file upload', array(), $transDomain), |
94 | | - 'post_max_size' => $translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain), |
95 | | - 'max_file_size' => $translator->trans('File is too big', array(), $transDomain), |
96 | | - 'min_file_size' => $translator->trans('File is too small', array(), $transDomain), |
97 | | - 'accept_file_types' => $translator->trans('Filetype not allowed', array(), $transDomain), |
98 | | - 'max_number_of_files' => $translator->trans('Maximum number of files exceeded', array(), $transDomain), |
99 | | - 'max_width' => $translator->trans('Image exceeds maximum width', array(), $transDomain), |
100 | | - 'min_width' => $translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain), |
101 | | - 'max_height' => $translator->trans('Image exceeds maximum height', array(), $transDomain), |
102 | | - 'min_height' => $translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain), |
103 | | - 'abort' => $translator->trans('File upload aborted', array(), $transDomain), |
104 | | - 'image_resize' => $translator->trans('Failed to resize image', array(), $transDomain), |
| 94 | + 1 => $this->translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain), |
| 95 | + 2 => $this->translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain), |
| 96 | + 3 => $this->translator->trans('The uploaded file was only partially uploaded', array(), $transDomain), |
| 97 | + 4 => $this->translator->trans('No file was uploaded', array(), $transDomain), |
| 98 | + 6 => $this->translator->trans('Missing a temporary folder', array(), $transDomain), |
| 99 | + 7 => $this->translator->trans('Failed to write file to disk', array(), $transDomain), |
| 100 | + 8 => $this->translator->trans('A PHP extension stopped the file upload', array(), $transDomain), |
| 101 | + 'post_max_size' => $this->translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain), |
| 102 | + 'max_file_size' => $this->translator->trans('File is too big', array(), $transDomain), |
| 103 | + 'min_file_size' => $this->translator->trans('File is too small', array(), $transDomain), |
| 104 | + 'accept_file_types' => $this->translator->trans('Filetype not allowed', array(), $transDomain), |
| 105 | + 'max_number_of_files' => $this->translator->trans('Maximum number of files exceeded', array(), $transDomain), |
| 106 | + 'max_width' => $this->translator->trans('Image exceeds maximum width', array(), $transDomain), |
| 107 | + 'min_width' => $this->translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain), |
| 108 | + 'max_height' => $this->translator->trans('Image exceeds maximum height', array(), $transDomain), |
| 109 | + 'min_height' => $this->translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain), |
| 110 | + 'abort' => $this->translator->trans('File upload aborted', array(), $transDomain), |
| 111 | + 'image_resize' => $this->translator->trans('Failed to resize image', array(), $transDomain), |
105 | 112 | ); |
106 | 113 |
|
107 | 114 | $response->setCallback(function () use($handlerConfig, $errorMessages) { |
@@ -431,8 +438,7 @@ private function resizeCropImage($destSrc, $imgSrc, $destX, $destY, $srcX, $srcY |
431 | 438 | */ |
432 | 439 | public function getTranslationCatalogue(Request $request) { |
433 | 440 | $transDomain = $this->container->getParameter('comur_image.translation_domain'); |
434 | | - $translator = $this->container->get('translator'); |
435 | | - $catalogue = $translator->getCatalogue($request->getLocale()); |
| 441 | + $catalogue = $this->translator->getCatalogue($request->getLocale()); |
436 | 442 | $messages = $catalogue->all(); |
437 | 443 |
|
438 | 444 | return $this->render('@ComurImage/translations.html.twig', array( |
|
0 commit comments