Skip to content

Commit 9c600e7

Browse files
fabpotfabpot
committed
Merge branch '2.3'
* 2.3: Update JsonResponse.php [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124) CookieJar remove unneeded var, Client remove unneeded else [DI] Fixed bug requesting non existing service from dumped frozen container Update validators.sk.xlf [WebProfiler] fix content-type parameter Replace romaji period characters with Japanese style zenkaku period characters fixed CS fixed CS [Console] Avoided an unnecessary check. Added missing French validator translations typo first->second Passed the config when building the Configuration in ConfigurableExtension removed unused code Fixed variable name used in translation cache Conflicts: src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
2 parents 7ebb05d + d0d0ff5 commit 9c600e7

File tree

5 files changed

+47
-10
lines changed

5 files changed

+47
-10
lines changed

‎Constraints/IbanValidator.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public function validate($value, Constraint $constraint)
5656

5757
if ($rest != 1) {
5858
$this->context->addViolation($constraint->message, array('{{ value }}' => $value));
59+
5960
return;
6061
}
6162
}

‎Resources/translations/validators.fr.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,42 @@
242242
<source>This value is not a valid ISSN.</source>
243243
<target>Cette valeur n'est pas un code ISSN valide.</target>
244244
</trans-unit>
245+
<trans-unit id="64">
246+
<source>This value is not a valid currency.</source>
247+
<target>Cette valeur n'est pas une devise valide.</target>
248+
</trans-unit>
249+
<trans-unit id="65">
250+
<source>This value should be equal to {{ compared_value }}.</source>
251+
<target>Cette valeur doit être égale à {{ compared_value }}.</target>
252+
</trans-unit>
253+
<trans-unit id="66">
254+
<source>This value should be greater than {{ compared_value }}.</source>
255+
<target>Cette valeur doit être supérieure à {{ compared_value }}.</target>
256+
</trans-unit>
257+
<trans-unit id="67">
258+
<source>This value should be greater than or equal to {{ compared_value }}.</source>
259+
<target>Cette valeur doit être supérieure ou égale à {{ compared_value }}.</target>
260+
</trans-unit>
261+
<trans-unit id="68">
262+
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
263+
<target>Cette valeur doit être identique à {{ compared_value_type }} {{ compared_value }}.</target>
264+
</trans-unit>
265+
<trans-unit id="69">
266+
<source>This value should be less than {{ compared_value }}.</source>
267+
<target>Cette valeur doit être inférieure à {{ compared_value }}.</target>
268+
</trans-unit>
269+
<trans-unit id="70">
270+
<source>This value should be less than or equal to {{ compared_value }}.</source>
271+
<target>Cette valeur doit être inférieure ou égale à {{ compared_value }}.</target>
272+
</trans-unit>
273+
<trans-unit id="71">
274+
<source>This value should not be equal to {{ compared_value }}.</source>
275+
<target>Cette valeur ne doit pas être égale à {{ compared_value }}.</target>
276+
</trans-unit>
277+
<trans-unit id="72">
278+
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
279+
<target>Cette valeur ne doit pas être identique à {{ compared_value_type }} {{ compared_value }}.</target>
280+
</trans-unit>
245281
</body>
246282
</file>
247283
</xliff>

‎Resources/translations/validators.ja.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</trans-unit>
2525
<trans-unit id="6">
2626
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
27-
<target>{{ limit }}個以上選択してください.</target>
27+
<target>{{ limit }}個以上選択してください。</target>
2828
</trans-unit>
2929
<trans-unit id="7">
3030
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
31-
<target>{{ limit }}個以内で選択してください.</target>
31+
<target>{{ limit }}個以内で選択してください。</target>
3232
</trans-unit>
3333
<trans-unit id="8">
3434
<source>One or more of the given values is invalid.</source>
@@ -76,15 +76,15 @@
7676
</trans-unit>
7777
<trans-unit id="19">
7878
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
79-
<target>値が長すぎます。{{ limit }}文字以内でなければなりません.</target>
79+
<target>値が長すぎます。{{ limit }}文字以内でなければなりません。</target>
8080
</trans-unit>
8181
<trans-unit id="20">
8282
<source>This value should be {{ limit }} or more.</source>
8383
<target>{{ limit }}以上でなければなりません。</target>
8484
</trans-unit>
8585
<trans-unit id="21">
8686
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
87-
<target>値が短すぎます。{{ limit }}文字以上でなければなりません.</target>
87+
<target>値が短すぎます。{{ limit }}文字以上でなければなりません。</target>
8888
</trans-unit>
8989
<trans-unit id="22">
9090
<source>This value should not be blank.</source>

‎Resources/translations/validators.sk.xlf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</trans-unit>
2525
<trans-unit id="6">
2626
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
27-
<target>Mali by ste vybrať minimálne {{ limit }} možnosti.</target>
27+
<target>Mali by ste vybrať minimálne {{ limit }} možnosť.|Mali by ste vybrať minimálne {{ limit }} možnosti.|Mali by ste vybrať minimálne {{ limit }} možností.</target>
2828
</trans-unit>
2929
<trans-unit id="7">
3030
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
31-
<target>Mali by ste vybrať najviac {{ limit }} možnosti.</target>
31+
<target>Mali by ste vybrať najviac {{ limit }} možnosť.|Mali by ste vybrať najviac {{ limit }} možnosti.|Mali by ste vybrať najviac {{ limit }} možností.</target>
3232
</trans-unit>
3333
<trans-unit id="8">
3434
<source>One or more of the given values is invalid.</source>
@@ -76,15 +76,15 @@
7676
</trans-unit>
7777
<trans-unit id="19">
7878
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
79-
<target>Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znakov.</target>
79+
<target>Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znak.|Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znaky.|Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znakov.</target>
8080
</trans-unit>
8181
<trans-unit id="20">
8282
<source>This value should be {{ limit }} or more.</source>
8383
<target>Táto hodnota by mala byť viac ako {{ limit }}.</target>
8484
</trans-unit>
8585
<trans-unit id="21">
8686
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
87-
<target>Táto hodnota nemá dostatočný počet znakov. Minimálny počet znakov je {{ limit }}.</target>
87+
<target>Táto hodnota je príliš krátka. Musí obsahovať minimálne {{ limit }} znak.|Táto hodnota je príliš krátka. Musí obsahovať minimálne {{ limit }} znaky.|Táto hodnota je príliš krátka. Minimálny počet znakov je {{ limit }}.</target>
8888
</trans-unit>
8989
<trans-unit id="22">
9090
<source>This value should not be blank.</source>
@@ -180,7 +180,7 @@
180180
</trans-unit>
181181
<trans-unit id="48">
182182
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
183-
<target>Táto hodnota by mala mať presne {{ limit }} znakov.</target>
183+
<target>Táto hodnota by mala mať presne {{ limit }} znak.|Táto hodnota by mala mať presne {{ limit }} znaky.|Táto hodnota by mala mať presne {{ limit }} znakov.</target>
184184
</trans-unit>
185185
<trans-unit id="49">
186186
<source>The file was only partially uploaded.</source>

‎Tests/Constraints/IsbnValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function testInvalidIsbn10($isbn)
163163
->expects($this->once())
164164
->method('addViolation')
165165
->with($constraint->isbn10Message);
166-
166+
167167
$this->validator->validate($isbn, $constraint);
168168
}
169169

0 commit comments

Comments
 (0)