From 2e4335fc70dc51151374f0b86331723794914a22 Mon Sep 17 00:00:00 2001 From: Noel Light-Hilary Date: Tue, 4 May 2021 13:06:07 +0100 Subject: [PATCH 1/3] Expand `LockConflictedException` docs The goal of this is to reduce the chance of bad assumptions about lock acquisition behaviour. Fixes #40969 --- .../Component/Lock/Exception/LockConflictedException.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Lock/Exception/LockConflictedException.php b/src/Symfony/Component/Lock/Exception/LockConflictedException.php index 8fcd6a836d..d882b8d029 100644 --- a/src/Symfony/Component/Lock/Exception/LockConflictedException.php +++ b/src/Symfony/Component/Lock/Exception/LockConflictedException.php @@ -11,9 +11,13 @@ namespace Symfony\Component\Lock\Exception; +use Symfony\Component\Lock\Lock; + /** * LockConflictedException is thrown when a lock is acquired by someone else. * + * In non-blocking mode it is caught by {@see Lock::acquire()} and {@see Lock::acquireRead()}. + * * @author Jérémy Derussé */ class LockConflictedException extends \RuntimeException implements ExceptionInterface From 076310cfe3637ae0218a2f696386c28f1c880515 Mon Sep 17 00:00:00 2001 From: Martin Hujer Date: Mon, 3 May 2021 10:37:16 +0200 Subject: [PATCH 2/3] [Security] Update Czech translations - closes #41040 - The translations are not perfect for some %minutes% values as the pluralization is more complicated in Czech than in English. - See: https://github.com/symfony/symfony/issues/40863#issuecomment-823928594 --- .../Security/Core/Resources/translations/security.cs.xlf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf index f953b4162a..13ace0de12 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf @@ -70,6 +70,14 @@ Invalid or expired login link. Neplatný nebo expirovaný odkaz na přihlášení. + + Too many failed login attempts, please try again in %minutes% minute. + Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minutu. + + + Too many failed login attempts, please try again in %minutes% minutes. + Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minut. + From 4e6e276d7777541452993fbcf3f3a3b1bcc3b480 Mon Sep 17 00:00:00 2001 From: Hamza Makraz Date: Tue, 4 May 2021 05:35:10 +0000 Subject: [PATCH 3/3] [Security] Add missing Spanish translations --- .../Security/Core/Resources/translations/security.es.xlf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf index b029197b81..2aec10587a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf @@ -70,6 +70,14 @@ Invalid or expired login link. Enlace de inicio de sesión inválido o expirado. + + Too many failed login attempts, please try again in %minutes% minute. + Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minuto. + + + Too many failed login attempts, please try again in %minutes% minutes. + Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos. +