Skip to content

Commit

Permalink
Merge branch '5.1' into 5.2
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@fabpot
fabpot committed Dec 18, 2020
2 parents 917a66e + 2100049 commit 312d367
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Mapping/Loader/AnnotationLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
if (preg_match('/^(get|is|has)(.+)$/i', $method->name, $matches)) {
$metadata->addGetterMethodConstraint(lcfirst($matches[2]), $matches[0], $constraint);
} else {
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));
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));
}
}

Expand Down
56 changes: 56 additions & 0 deletions Resources/translations/validators.eu.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,62 @@
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
<target>Banku Identifikazioko Kode hau ez dago lotuta {{ IBAN }} IBAN-rekin.</target>
</trans-unit>
<trans-unit id="86">
<source>This value should be valid JSON.</source>
<target>Balio honek baliozko JSON bat izan behar luke.</target>
</trans-unit>
<trans-unit id="87">
<source>This collection should contain only unique elements.</source>
<target>Bilduma honek elementu bakarrak soilik izan beharko lituzke.</target>
</trans-unit>
<trans-unit id="88">
<source>This value should be positive.</source>
<target>Balio honek positiboa izan beharko luke.</target>
</trans-unit>
<trans-unit id="89">
<source>This value should be either positive or zero.</source>
<target>Balio honek positiboa edo zero izan behar luke.</target>
</trans-unit>
<trans-unit id="90">
<source>This value should be negative.</source>
<target>Balio honek negatiboa izan behar luke.</target>
</trans-unit>
<trans-unit id="91">
<source>This value should be either negative or zero.</source>
<target>Balio honek negatiboa edo zero izan behar luke.</target>
</trans-unit>
<trans-unit id="92">
<source>This value is not a valid timezone.</source>
<target>Balio hori ez da baliozko ordu-eremua.</target>
</trans-unit>
<trans-unit id="93">
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<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>
</trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Balio honek {{ min }} eta {{ max }} artean egon behar luke.</target>
</trans-unit>
<trans-unit id="95">
<source>This value is not a valid hostname.</source>
<target>Balio hori ez da ostalari-izen onargarria.</target>
</trans-unit>
<trans-unit id="96">
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
<target>Bilduma honetako elementu-kopuruak {{ compared_value }}-ren multiploa izan behar luke.</target>
</trans-unit>
<trans-unit id="97">
<source>This value should satisfy at least one of the following constraints:</source>
<target>Balio honek, gutxienez, murrizketa hauetako bat bete behar du:</target>
</trans-unit>
<trans-unit id="98">
<source>Each element of this collection should satisfy its own set of constraints.</source>
<target>Bilduma honetako elementu bakoitzak bere murriztapen-multzoa bete behar du.</target>
</trans-unit>
<trans-unit id="99">
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
<target>Balio hori ez da baliozko baloreen nazioarteko identifikazio-zenbaki bat (ISIN).</target>
</trans-unit>
</body>
</file>
</xliff>
60 changes: 56 additions & 4 deletions Resources/translations/validators.lb.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<target>Een oder méi vun de Wäerter ass ongëlteg.</target>
</trans-unit>
<trans-unit id="9">
<source>The fields {{ fields }} were not expected.</source>
<target>D'Felder {{ fields }} goufen net erwaart.</target>
<source>This field was not expected.</source>
<target>D'Feld gouf net erwaart.</target>
</trans-unit>
<trans-unit id="10">
<source>The fields {{ fields }} are missing.</source>
<target>D'Felder {{ fields }} feelen.</target>
<source>This field is missing.</source>
<target>D'Feld feelt.</target>
</trans-unit>
<trans-unit id="11">
<source>This value is not a valid date.</source>
Expand Down Expand Up @@ -334,6 +334,58 @@
<source>This value should be valid JSON.</source>
<target>Dëse Wäert sollt gëlteg JSON.</target>
</trans-unit>
<trans-unit id="87">
<source>This collection should contain only unique elements.</source>
<target>Dës Sammlung sollt just eenzegaarteg Elementer enthalen.</target>
</trans-unit>
<trans-unit id="88">
<source>This value should be positive.</source>
<target>Dëse Wäert sollt positiv sinn.</target>
</trans-unit>
<trans-unit id="89">
<source>This value should be either positive or zero.</source>
<target>Dëse Wäert sollt entweeder positiv oder null sinn.</target>
</trans-unit>
<trans-unit id="90">
<source>This value should be negative.</source>
<target>Dëse Wäert sollt negativ sinn.</target>
</trans-unit>
<trans-unit id="91">
<source>This value should be either negative or zero.</source>
<target>Dëse Wäert sollt entweeder negativ oder null sinn.</target>
</trans-unit>
<trans-unit id="92">
<source>This value is not a valid timezone.</source>
<target>Dëse Wäert ass keng gëlteg Zäitzon.</target>
</trans-unit>
<trans-unit id="93">
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>Dëst Passwuert war Deel vun engem Dateleck an dierf net benotzt ginn. Benotzt w.e.g. en anert Passwuert .</target>
</trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>De Wäert sollt tëscht {{ min }} a(n) {{ max }} leien.</target>
</trans-unit>
<trans-unit id="95">
<source>This value is not a valid hostname.</source>
<target>Dëse Wäert ass kee gëltegen Hostnumm.</target>
</trans-unit>
<trans-unit id="96">
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
<target>D'Unzuel un Elementer an dëser Sammlung sollt e multipel vu(n) {{ compared_value }} sinn.</target>
</trans-unit>
<trans-unit id="97">
<source>This value should satisfy at least one of the following constraints:</source>
<target>Dëse Wäert sollt op d'mannst ee vun dësen Aschränkungen erfëllen:</target>
</trans-unit>
<trans-unit id="98">
<source>Each element of this collection should satisfy its own set of constraints.</source>
<target>All Element aus dëser Sammlung sollt seng eegen Aschränkungen erfëllen.</target>
</trans-unit>
<trans-unit id="99">
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
<target>Dëse Wäert ass keng gëlteg International Wäertpabeiererkennnummer (ISIN).</target>
</trans-unit>
</body>
</file>
</xliff>

0 comments on commit 312d367

Please sign in to comment.