Merge branch '4.4' into 5.2
* 4.4: Optimize travis file a bit Remove duplicate catch block Add missing translations for Thai Add missing translations for Swedish
This commit is contained in:
commit
3004b9c089
@ -121,7 +121,7 @@ before_install:
|
||||
# php.ini configuration
|
||||
(
|
||||
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
|
||||
(cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj) &
|
||||
([[ $PHP != 7.4 ]] && phpenv global $PHP 2>/dev/null) || (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/18.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj) &
|
||||
done
|
||||
wait
|
||||
)
|
||||
|
@ -39,11 +39,6 @@ class CachePoolsTest extends AbstractWebTestCase
|
||||
throw $e;
|
||||
}
|
||||
$this->markTestSkipped($e->getMessage());
|
||||
} catch (\PHPUnit\Framework\Error\Warning $e) {
|
||||
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
|
||||
throw $e;
|
||||
}
|
||||
$this->markTestSkipped($e->getMessage());
|
||||
} catch (InvalidArgumentException $e) {
|
||||
if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
|
||||
throw $e;
|
||||
@ -67,11 +62,6 @@ class CachePoolsTest extends AbstractWebTestCase
|
||||
throw $e;
|
||||
}
|
||||
$this->markTestSkipped($e->getMessage());
|
||||
} catch (\PHPUnit\Framework\Error\Warning $e) {
|
||||
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
|
||||
throw $e;
|
||||
}
|
||||
$this->markTestSkipped($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,6 +70,14 @@
|
||||
<source>Invalid or expired login link.</source>
|
||||
<target>Ogiltig eller utgången inloggningslänk.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="19">
|
||||
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
|
||||
<target>För många misslyckade inloggningsförsök, försök igen om %minutes% minut.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="20">
|
||||
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
|
||||
<target>För många misslyckade inloggningsförsök, försök igen om %minutes% minuter.</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
@ -70,6 +70,14 @@
|
||||
<source>Invalid or expired login link.</source>
|
||||
<target>ลิงค์เข้าสู่ระบบไม่ถูกต้องหรือหมดอายุไปแล้ว</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="19">
|
||||
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
|
||||
<target>มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="20">
|
||||
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
|
||||
<target>มีความพยายามเข้าสู่ระบบล้มเหลวมากเกินไป โปรดลองอีกครั้งใน %minutes% นาที</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
Reference in New Issue
Block a user