diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source 
* 2.2:
  fixed typo in CS translation (closes #8069)
  fix arab translation
  [Finder] Fixed a path in a test.
  [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065)
This commit is contained in:
Fabien Potencier 2013-06-02 14:05:51 +02:00
commit 7fb9c25f8c
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Finder/Tests/FinderTest.php
View File

@ -808,7 +808,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
{ {
$locations = array( $locations = array(
__DIR__.'/Fixtures/one', __DIR__.'/Fixtures/one',
self::$files[8], self::$tmpDir.DIRECTORY_SEPARATOR.'toto',
); );
$finder = new Finder(); $finder = new Finder();

2
src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
View File

@ -121,7 +121,7 @@ class FormValidator extends ConstraintValidator
if ($form->isRoot() && null !== $length) { if ($form->isRoot() && null !== $length) {
$max = $this->serverParams->getPostMaxSize(); $max = $this->serverParams->getPostMaxSize();
if (null !== $max && $length > $max) { if (!empty($max) && $length > $max) {
$this->context->addViolation( $this->context->addViolation(
$config->getOption('post_max_size_message'), $config->getOption('post_max_size_message'),
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()), array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()),

1
src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
View File

@ -660,6 +660,7 @@ class FormValidatorTest extends \PHPUnit_Framework_TestCase
array(1024, '1K', 0), array(1024, '1K', 0),
array(null, '1K', 0), array(null, '1K', 0),
array(1024, '', 0), array(1024, '', 0),
array(1024, 0, 0),
); );
} }

2
src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf
View File

@ -4,7 +4,7 @@
<body> <body>
<trans-unit id="1"> <trans-unit id="1">
<source>This value should be false.</source> <source>This value should be false.</source>
<target>هذه القيمة يجب أن تكون كاذبة.</target> <target>هذه القيمة يجب أن تكون خاطئة.</target>
</trans-unit> </trans-unit>
<trans-unit id="2"> <trans-unit id="2">
<source>This value should be true.</source> <source>This value should be true.</source>

2
src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
View File

@ -180,7 +180,7 @@
</trans-unit> </trans-unit>
<trans-unit id="48"> <trans-unit id="48">
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source> <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>
<trans-unit id="49"> <trans-unit id="49">
<source>The file was only partially uploaded.</source> <source>The file was only partially uploaded.</source>