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 German translations
  [ErrorHandler] Skip "same vendor" `@method` deprecations for `Symfony\*` classes unless symfony/symfony is being tested
  [Security] Add missing Dutch translations
This commit is contained in:
Alexander M. Turek 2021-05-03 22:27:30 +02:00
commit 6e22f082c3
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/ErrorHandler/DebugClassLoader.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\ErrorHandler;
use Composer\InstalledVersions;
use Doctrine\Common\Persistence\Proxy as LegacyProxy;
use Doctrine\Persistence\Proxy;
use Mockery\MockInterface;
@ -491,6 +492,14 @@ class DebugClassLoader
self::$method[$class] = self::$method[$use];
}
} elseif (!$refl->isInterface()) {
if (!strncmp($vendor, str_replace('_', '\\', $use), $vendorLen)
&& 0 === strpos($className, 'Symfony\\')
&& (!class_exists(InstalledVersions::class)
|| 'symfony/symfony' !== InstalledVersions::getRootPackage()['name'])
) {
// skip "same vendor" @method deprecations for Symfony\* classes unless symfony/symfony is being tested
continue;
}
$hasCall = $refl->hasMethod('__call');
$hasStaticCall = $refl->hasMethod('__callStatic');
foreach (self::$method[$use] as $method) {

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

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Ungültiger oder abgelaufener Anmelde-Link.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in einer Minute noch einmal.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in %minutes% Minuten noch einmal.</target>
</trans-unit>
</body>
</file>
</xliff>

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

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Ongeldige of verlopen inloglink.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuut.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuten.</target>
</trans-unit>
</body>
</file>
</xliff>