Skip to content

Commit c22baf5

Browse files
committed
Merge branch '5.1' into 5.x
2 parents ec72a03 + aab131f commit c22baf5

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Resources/translations/security.af.xlf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<source>Invalid CSRF token.</source>
3131
<target>Ongeldige CSRF-teken.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Digest nonce het verval.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Geen verifikasieverskaffer is gevind wat die verifikasietoken kan ondersteun nie.</target>

Resources/translations/security.bs.xlf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<source>Invalid CSRF token.</source>
3131
<target>CSRF žeton (token) je neispravan.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Digest nonce je istekao.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Nije pronađen autentifikacijski provajder koji bi podržao dati autentifikacijski žeton (token).</target>

Resources/translations/security.da.xlf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</trans-unit>
99
<trans-unit id="2">
1010
<source>Authentication credentials could not be found.</source>
11-
<target>Loginoplysninger kan findes.</target>
11+
<target>Loginoplysninger kan ikke findes.</target>
1212
</trans-unit>
1313
<trans-unit id="3">
1414
<source>Authentication request could not be processed due to a system problem.</source>
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>Brugerkonto er låst.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>For mange fejlede login forsøg, prøv venligst senere.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Ugyldigt eller udløbet login link.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

Tests/Validator/Constraints/UserPasswordValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
2525
{
26-
const PASSWORD = 's3Cr3t';
27-
const SALT = '^S4lt$';
26+
private const PASSWORD = 's3Cr3t';
27+
private const SALT = '^S4lt$';
2828

2929
/**
3030
* @var TokenStorageInterface

0 commit comments

Comments
 (0)