Skip to content

Commit 0aad390

Browse files
committed
Merge branch '4.4' into 5.1
2 parents 13f9711 + 6950a82 commit 0aad390

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

Resources/translations/security.fi.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>Virheellinen CSRF tunnus.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Digest nonce on vanhentunut.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Autentikointi tunnukselle ei löydetty tuettua autentikointi tarjoajaa.</target>

Resources/translations/security.sq.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>Identifikues i pavlefshëm CSRF.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Numeri një perdorimësh i verifikimit Digest ka skaduar.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Asnjë ofrues i vërtetimit nuk u gjet që të mbështesë simbolin e vërtetimit.</target>

Resources/translations/security.th.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>บัญชีถูกล็อกแล้ว</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป กรุณาลองใหม่ภายหลัง</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>ลิงค์เข้าสู่ระบบไม่ถูกต้องหรือหมดอายุไปแล้ว</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

Resources/translations/security.tl.xlf

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,27 @@
4848
</trans-unit>
4949
<trans-unit id="13">
5050
<source>Account has expired.</source>
51-
<target>Ang akawnt ay nag-expire na.</target>
51+
<target>Ang account ay nag-expire na.</target>
5252
</trans-unit>
5353
<trans-unit id="14">
5454
<source>Credentials have expired.</source>
55-
<target>.ng mga kinakailangang dokumento ay nag expire na.</target>
55+
<target>Ang mga kinakailangang dokumento ay nag expire na.</target>
5656
</trans-unit>
5757
<trans-unit id="15">
5858
<source>Account is disabled.</source>
59-
<target>Ang akawnt ay hindi pinagana.</target>
59+
<target>Ang account ay hindi pinagana.</target>
6060
</trans-unit>
6161
<trans-unit id="16">
6262
<source>Account is locked.</source>
63-
<target>ng akawnt ay nakasara.</target>
63+
<target>Ang account ay nakasara.</target>
64+
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Madaming bagsak na pagtatangka, pakisubukan ulit mamaya.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Inbalido o nagexpire na ang link para makapaglogin.</target>
6472
</trans-unit>
6573
</body>
6674
</file>

Resources/translations/security.zh_TW.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 token 。</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>摘要隨機串(digest nonce)已過期。</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>沒有找到支持此 token 的身份驗證服務提供方。</target>

Tests/Authorization/TraceableAccessDecisionManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testDecideLog(array $expectedLog, array $attributes, $object, ar
4040
->with($token, $attributes, $object)
4141
->willReturnCallback(function ($token, $attributes, $object) use ($voterVotes, $adm, $result) {
4242
foreach ($voterVotes as $voterVote) {
43-
list($voter, $vote) = $voterVote;
43+
[$voter, $vote] = $voterVote;
4444
$adm->addVoterVote($voter, $attributes, $vote);
4545
}
4646

0 commit comments

Comments
 (0)