Skip to content

Commit 312d367

Browse files
fabpotfabpot
committed
Merge branch '5.1' into 5.2
* 5.1: Remove void return type from test methods Added basque translations Updated Luxembourgish translations [Mailer] Fix parsing Dsn with empty user/password Normalize exceptions messages containing methods references [Ldap] Incorrect determination of RelativeDistinguishedName for the "move" operation
2 parents 917a66e + 2100049 commit 312d367

File tree

3 files changed

+113
-5
lines changed

3 files changed

+113
-5
lines changed

‎Mapping/Loader/AnnotationLoader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
7878
if (preg_match('/^(get|is|has)(.+)$/i', $method->name, $matches)) {
7979
$metadata->addGetterMethodConstraint(lcfirst($matches[2]), $matches[0], $constraint);
8080
} else {
81-
throw new MappingException(sprintf('The constraint on "%s::%s" cannot be added. Constraints can only be added on methods beginning with "get", "is" or "has".', $className, $method->name));
81+
throw new MappingException(sprintf('The constraint on "%s::%s()" cannot be added. Constraints can only be added on methods beginning with "get", "is" or "has".', $className, $method->name));
8282
}
8383
}
8484

‎Resources/translations/validators.eu.xlf‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,62 @@
330330
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
331331
<target>Banku Identifikazioko Kode hau ez dago lotuta {{ IBAN }} IBAN-rekin.</target>
332332
</trans-unit>
333+
<trans-unit id="86">
334+
<source>This value should be valid JSON.</source>
335+
<target>Balio honek baliozko JSON bat izan behar luke.</target>
336+
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Bilduma honek elementu bakarrak soilik izan beharko lituzke.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>Balio honek positiboa izan beharko luke.</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>Balio honek positiboa edo zero izan behar luke.</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>Balio honek negatiboa izan behar luke.</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>Balio honek negatiboa edo zero izan behar luke.</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Balio hori ez da baliozko ordu-eremua.</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Pasahitz hori ezin da erabili, beste gune eta aplikazio batzuetako segurtasun-akatsei esker lortutako pasahitz publikoen zerrendan sartuta dagoelako. Mesedez, erabili beste pasahitz bat.</target>
364+
</trans-unit>
365+
<trans-unit id="94">
366+
<source>This value should be between {{ min }} and {{ max }}.</source>
367+
<target>Balio honek {{ min }} eta {{ max }} artean egon behar luke.</target>
368+
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Balio hori ez da ostalari-izen onargarria.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>Bilduma honetako elementu-kopuruak {{ compared_value }}-ren multiploa izan behar luke.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Balio honek, gutxienez, murrizketa hauetako bat bete behar du:</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>Bilduma honetako elementu bakoitzak bere murriztapen-multzoa bete behar du.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Balio hori ez da baliozko baloreen nazioarteko identifikazio-zenbaki bat (ISIN).</target>
388+
</trans-unit>
333389
</body>
334390
</file>
335391
</xliff>

‎Resources/translations/validators.lb.xlf‎

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
<target>Een oder méi vun de Wäerter ass ongëlteg.</target>
3636
</trans-unit>
3737
<trans-unit id="9">
38-
<source>The fields {{ fields }} were not expected.</source>
39-
<target>D'Felder {{ fields }} goufen net erwaart.</target>
38+
<source>This field was not expected.</source>
39+
<target>D'Feld gouf net erwaart.</target>
4040
</trans-unit>
4141
<trans-unit id="10">
42-
<source>The fields {{ fields }} are missing.</source>
43-
<target>D'Felder {{ fields }} feelen.</target>
42+
<source>This field is missing.</source>
43+
<target>D'Feld feelt.</target>
4444
</trans-unit>
4545
<trans-unit id="11">
4646
<source>This value is not a valid date.</source>
@@ -334,6 +334,58 @@
334334
<source>This value should be valid JSON.</source>
335335
<target>Dëse Wäert sollt gëlteg JSON.</target>
336336
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Dës Sammlung sollt just eenzegaarteg Elementer enthalen.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>Dëse Wäert sollt positiv sinn.</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>Dëse Wäert sollt entweeder positiv oder null sinn.</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>Dëse Wäert sollt negativ sinn.</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>Dëse Wäert sollt entweeder negativ oder null sinn.</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Dëse Wäert ass keng gëlteg Zäitzon.</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Dëst Passwuert war Deel vun engem Dateleck an dierf net benotzt ginn. Benotzt w.e.g. en anert Passwuert .</target>
364+
</trans-unit>
365+
<trans-unit id="94">
366+
<source>This value should be between {{ min }} and {{ max }}.</source>
367+
<target>De Wäert sollt tëscht {{ min }} a(n) {{ max }} leien.</target>
368+
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Dëse Wäert ass kee gëltegen Hostnumm.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>D'Unzuel un Elementer an dëser Sammlung sollt e multipel vu(n) {{ compared_value }} sinn.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Dëse Wäert sollt op d'mannst ee vun dësen Aschränkungen erfëllen:</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>All Element aus dëser Sammlung sollt seng eegen Aschränkungen erfëllen.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Dëse Wäert ass keng gëlteg International Wäertpabeiererkennnummer (ISIN).</target>
388+
</trans-unit>
337389
</body>
338390
</file>
339391
</xliff>

0 commit comments

Comments
 (0)