diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.2

Browse Source 
* 4.4:
  [Security] Add missing Spanish translations
  [Security] Update Czech translations
  Expand `LockConflictedException` docs
This commit is contained in:
Alexander M. Turek 2021-05-04 18:02:46 +02:00
commit 24febfaae8
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Lock/Exception/LockConflictedException.php
View File

@ -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é <jeremy@derusse.com>
*/
class LockConflictedException extends \RuntimeException implements ExceptionInterface

8
src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
View File

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Neplatný nebo expirovaný odkaz na přihlášení.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minutu.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minut.</target>
</trans-unit>
</body>
</file>
</xliff>

8
src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
View File

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Enlace de inicio de sesión inválido o expirado.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minuto.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos.</target>
</trans-unit>
</body>
</file>
</xliff>