symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php
Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/NativeRequestHandler.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/NativeRequestHandler.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
Lines changed: 7 additions & 1 deletion
@@ -146,6 +146,13 @@ public function configureOptions(OptionsResolver $resolver)
             };
         };
 
+        // Wrap "post_max_size_message" in a closure to translate it lazily
+        $uploadMaxSizeMessage = function (Options $options) {
+            return function () use ($options) {
+                return $options['post_max_size_message'];
+            };
+        };
+
         // For any form that is not represented by a single HTML control,
         // errors should bubble up by default
         $errorBubbling = function (Options $options) {
@@ -207,9 +214,11 @@ public function configureOptions(OptionsResolver $resolver)
             'action' => '',
             'attr' => $defaultAttr,
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
+            'upload_max_size_message' => $uploadMaxSizeMessage, // internal
         ));
 
         $resolver->setAllowedTypes('label_attr', 'array');
+        $resolver->setAllowedTypes('upload_max_size_message', array('callable'));
     }
 
     /**
 
@@ -78,7 +78,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->submit(null, false);
 
                 $form->addError(new FormError(
-                    $form->getConfig()->getOption('post_max_size_message'),
+                    call_user_func($form->getConfig()->getOption('upload_max_size_message')),
                     null,
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
                 ));
 
@@ -42,9 +42,10 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $translator = $this->translator;
         $translationDomain = $this->translationDomain;
-
-        $resolver->setNormalizer('post_max_size_message', function (Options $options, $errorMessage) use ($translator, $translationDomain) {
-            return $translator->trans($errorMessage, array(), $translationDomain);
+        $resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {
+            return function () use ($translator, $translationDomain, $message) {
+                return $translator->trans(call_user_func($message), array(), $translationDomain);
+            };
         });
     }
 
 
@@ -86,7 +86,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->submit(null, false);
 
                 $form->addError(new FormError(
-                    $form->getConfig()->getOption('post_max_size_message'),
+                    call_user_func($form->getConfig()->getOption('upload_max_size_message')),
                     null,
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
                 ));
 
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\Options;
 
 class UploadValidatorExtensionTest extends TypeTestCase
 {
@@ -29,10 +30,15 @@ public function testPostMaxSizeTranslation()
 
         $resolver = new OptionsResolver();
         $resolver->setDefault('post_max_size_message', 'old max {{ max }}!');
+        $resolver->setDefault('upload_max_size_message', function (Options $options, $message) {
+            return function () use ($options) {
+                return $options['post_max_size_message'];
+            };
+        });
 
         $extension->configureOptions($resolver);
         $options = $resolver->resolve();
 
-        $this->assertEquals('translated max {{ max }}!', $options['post_max_size_message']);
+        $this->assertEquals('translated max {{ max }}!', call_user_func($options['upload_max_size_message']));
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,10 @@ public function configureOptions(OptionsResolver $resolver)`
`42`	`42`	`{`
`43`	`43`	`$translator = $this->translator;`
`44`	`44`	`$translationDomain = $this->translationDomain;`
`45`		`-`
`46`		`- $resolver->setNormalizer('post_max_size_message', function (Options $options, $errorMessage) use ($translator, $translationDomain) {`
`47`		`- return $translator->trans($errorMessage, array(), $translationDomain);`
	`45`	`+ $resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {`
	`46`	`+ return function () use ($translator, $translationDomain, $message) {`
	`47`	`+ return $translator->trans(call_user_func($message), array(), $translationDomain);`
	`48`	`+ };`
`48`	`49`	`});`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension;`
`15`	`15`	`use Symfony\Component\OptionsResolver\OptionsResolver;`
	`16`	`+use Symfony\Component\OptionsResolver\Options;`
`16`	`17`
`17`	`18`	`class UploadValidatorExtensionTest extends TypeTestCase`
`18`	`19`	`{`
`@@ -29,10 +30,15 @@ public function testPostMaxSizeTranslation()`
`29`	`30`
`30`	`31`	`$resolver = new OptionsResolver();`
`31`	`32`	`$resolver->setDefault('post_max_size_message', 'old max {{ max }}!');`
	`33`	`+ $resolver->setDefault('upload_max_size_message', function (Options $options, $message) {`
	`34`	`+ return function () use ($options) {`
	`35`	`+ return $options['post_max_size_message'];`
	`36`	`+ };`
	`37`	`+ });`
`32`	`38`
`33`	`39`	`$extension->configureOptions($resolver);`
`34`	`40`	`$options = $resolver->resolve();`
`35`	`41`
`36`		`- $this->assertEquals('translated max {{ max }}!', $options['post_max_size_message']);`
	`42`	`+ $this->assertEquals('translated max {{ max }}!', call_user_func($options['upload_max_size_message']));`
`37`	`43`	`}`
`38`	`44`	`}`