Skip to content

Commit 3b597f5

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [Mime] Fix encoding filenames in multipart/form-data [Validator] Improve French translation [Translations] Add missing translations for Galician (gl) [DependencyInjection] fix linting callable classes restore the overriden locale on tearDown - avoid interfering with any configured value [DependencyInjection] Cast tag value to string
2 parents 26fd661 + dba84cf commit 3b597f5

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Resources/translations/validators.fr.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
</trans-unit>
193193
<trans-unit id="51">
194194
<source>No temporary folder was configured in php.ini.</source>
195-
<target>Aucun répertoire temporaire n'a été configuré dans le php.ini.</target>
195+
<target>Aucun répertoire temporaire n'a été configuré dans le php.ini, ou le répertoire configuré n'existe pas.</target>
196196
</trans-unit>
197197
<trans-unit id="52">
198198
<source>Cannot write temporary file to disk.</source>

Resources/translations/validators.gl.xlf

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
</trans-unit>
193193
<trans-unit id="51">
194194
<source>No temporary folder was configured in php.ini.</source>
195-
<target>Ningunha carpeta temporal foi configurada en php.ini.</target>
195+
<target>Ningunha carpeta temporal foi configurada en php.ini, ou a carpeta non existe.</target>
196196
</trans-unit>
197197
<trans-unit id="52">
198198
<source>Cannot write temporary file to disk.</source>
@@ -364,7 +364,7 @@
364364
</trans-unit>
365365
<trans-unit id="94">
366366
<source>This value should be between {{ min }} and {{ max }}.</source>
367-
<target>Este valor debe estar comprendido entre {{min}} e {{max}}.</target>
367+
<target>Este valor debe estar comprendido entre {{ min }} e {{ max }}.</target>
368368
</trans-unit>
369369
<trans-unit id="95">
370370
<source>This value is not a valid hostname.</source>
@@ -394,6 +394,14 @@
394394
<source>This value is not a valid CSS color.</source>
395395
<target>Este valor non é unha cor CSS válida.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Este valor non ten unha notación CIDR válida.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>O valor da máscara de rede debería estar entre {{ min }} e {{ max }}.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

Test/ConstraintValidatorTestCase.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ abstract class ConstraintValidatorTestCase extends TestCase
5858
protected $propertyPath;
5959
protected $constraint;
6060
protected $defaultTimezone;
61+
private $defaultLocale;
6162
private $expectedViolations;
6263
private $call;
6364

@@ -78,17 +79,20 @@ protected function setUp(): void
7879
$this->validator = $this->createValidator();
7980
$this->validator->initialize($this->context);
8081

82+
$this->defaultLocale = \Locale::getDefault();
83+
\Locale::setDefault('en');
84+
8185
$this->expectedViolations = [];
8286
$this->call = 0;
8387

84-
\Locale::setDefault('en');
85-
8688
$this->setDefaultTimezone('UTC');
8789
}
8890

8991
protected function tearDown(): void
9092
{
9193
$this->restoreDefaultTimezone();
94+
95+
\Locale::setDefault($this->defaultLocale);
9296
}
9397

9498
protected function setDefaultTimezone(?string $defaultTimezone)

0 commit comments

Comments
 (0)