Merge branch '2.1' into 2.2

fabpot · fabpot · commit afe18722d2fa · 2013-06-02T14:05:41.000+02:00
* 2.1: fixed typo in CS translation (closes #8069) [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065) Conflicts: src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -120,7 +120,7 @@ public function validate($form, Constraint $constraint)
         if ($form->isRoot() && null !== $length) {
             $max = $this->serverParams->getPostMaxSize();
 
-            if (null !== $max && $length > $max) {
+            if (!empty($max) && $length > $max) {
                 $this->context->addViolation(
                     $config->getOption('post_max_size_message'),
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()),
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -518,6 +518,7 @@ public function getPostMaxSizeFixtures()
             array(1024, '1K', 0),
             array(null, '1K', 0),
             array(1024, '', 0),
+            array(1024, 0, 0),
         );
     }
 
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
@@ -180,7 +180,7 @@
             </trans-unit>
             <trans-unit id="48">
                 <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Tato hodnota musí mít přesně {{ limit }} znak.|Tato hodnota musí mít přesně {{ limit }} znaky.|Tato hodnota musí mít přesně {{limit}} znaků.</target>
+                <target>Tato hodnota musí mít přesně {{ limit }} znak.|Tato hodnota musí mít přesně {{ limit }} znaky.|Tato hodnota musí mít přesně {{ limit }} znaků.</target>
             </trans-unit>
             <trans-unit id="49">
                 <source>The file was only partially uploaded.</source>

Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,7 @@ public function getPostMaxSizeFixtures()`
`518`	`518`	`array(1024, '1K', 0),`
`519`	`519`	`array(null, '1K', 0),`
`520`	`520`	`array(1024, '', 0),`
	`521`	`+ array(1024, 0, 0),`
`521`	`522`	`);`
`522`	`523`	`}`
`523`	`524`