Merge branch '4.4' into 5.1
This commit is contained in:
commit
a29af81af4
@ -162,11 +162,11 @@ before_install:
|
|||||||
tfold ext.mongodb tpecl mongodb-1.6.16 mongodb.so $INI
|
tfold ext.mongodb tpecl mongodb-1.6.16 mongodb.so $INI
|
||||||
tfold ext.zookeeper tpecl zookeeper-0.7.2 zookeeper.so $INI
|
tfold ext.zookeeper tpecl zookeeper-0.7.2 zookeeper.so $INI
|
||||||
tfold ext.amqp tpecl amqp-1.10.2 amqp.so $INI
|
tfold ext.amqp tpecl amqp-1.10.2 amqp.so $INI
|
||||||
tfold ext.redis tpecl redis-5.2.2 redis.so $INI "no"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tfold ext.apcu tpecl apcu-5.1.19 apcu.so $INI
|
tfold ext.apcu tpecl apcu-5.1.19 apcu.so $INI
|
||||||
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
|
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
|
||||||
|
tfold ext.redis tpecl redis-5.2.3 redis.so $INI "no"
|
||||||
done
|
done
|
||||||
|
|
||||||
- |
|
- |
|
||||||
|
11
phpunit
11
phpunit
@ -8,18 +8,13 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
|
if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
|
||||||
if (\PHP_VERSION_ID >= 70200) {
|
if (\PHP_VERSION_ID < 70200) {
|
||||||
if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
|
putenv('SYMFONY_PHPUNIT_VERSION=7.5');
|
||||||
putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
|
} elseif (\PHP_VERSION_ID < 70300) {
|
||||||
}
|
|
||||||
if (\PHP_VERSION_ID < 70300) {
|
|
||||||
putenv('SYMFONY_PHPUNIT_VERSION=8.5');
|
putenv('SYMFONY_PHPUNIT_VERSION=8.5');
|
||||||
} else {
|
} else {
|
||||||
putenv('SYMFONY_PHPUNIT_VERSION=9.4');
|
putenv('SYMFONY_PHPUNIT_VERSION=9.4');
|
||||||
}
|
}
|
||||||
} elseif (\PHP_VERSION_ID >= 70000) {
|
|
||||||
putenv('SYMFONY_PHPUNIT_VERSION=6.5');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
|
if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
|
||||||
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
|
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
<file source-language="en" datatype="plaintext" original="file.ext">
|
<file source-language="en" datatype="plaintext" original="file.ext">
|
||||||
<body>
|
<body>
|
||||||
<trans-unit id="28">
|
<trans-unit id="28">
|
||||||
<source>This field group should not contain extra fields.</source>
|
<source>This form should not contain extra fields.</source>
|
||||||
<target>Tämä kenttäryhmä ei voi sisältää ylimääräisiä kenttiä.</target>
|
<target>Tämä lomake ei voi sisältää ylimääräisiä kenttiä.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="29">
|
<trans-unit id="29">
|
||||||
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
|
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
|
||||||
@ -12,7 +12,127 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="30">
|
<trans-unit id="30">
|
||||||
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
|
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
|
||||||
<target>CSRF tarkiste on virheellinen. Ole hyvä ja yritä lähettää lomake uudestaan.</target>
|
<target>CSRF-tarkiste on virheellinen. Ole hyvä ja yritä lähettää lomake uudestaan.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="99">
|
||||||
|
<source>This value is not a valid HTML5 color.</source>
|
||||||
|
<target>Tämä arvo ei ole kelvollinen HTML5-väri.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="100">
|
||||||
|
<source>Please enter a valid birthdate.</source>
|
||||||
|
<target>Syötä kelvollinen syntymäaika.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="101">
|
||||||
|
<source>The selected choice is invalid.</source>
|
||||||
|
<target>Valittu vaihtoehto ei kelpaa.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="102">
|
||||||
|
<source>The collection is invalid.</source>
|
||||||
|
<target>Ryhmä ei kelpaa.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="103">
|
||||||
|
<source>Please select a valid color.</source>
|
||||||
|
<target>Valitse kelvollinen väri.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="104">
|
||||||
|
<source>Please select a valid country.</source>
|
||||||
|
<target>Valitse kelvollinen maa.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="105">
|
||||||
|
<source>Please select a valid currency.</source>
|
||||||
|
<target>Valitse kelvollinen valuutta.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="106">
|
||||||
|
<source>Please choose a valid date interval.</source>
|
||||||
|
<target>Valitse kelvollinen aikaväli.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="107">
|
||||||
|
<source>Please enter a valid date and time.</source>
|
||||||
|
<target>Syötä kelvolliset päivä ja aika.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="108">
|
||||||
|
<source>Please enter a valid date.</source>
|
||||||
|
<target>Syötä kelvollinen päivä.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="109">
|
||||||
|
<source>Please select a valid file.</source>
|
||||||
|
<target>Valitse kelvollinen tiedosto.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="110">
|
||||||
|
<source>The hidden field is invalid.</source>
|
||||||
|
<target>Piilotettu kenttä ei ole kelvollinen.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="111">
|
||||||
|
<source>Please enter an integer.</source>
|
||||||
|
<target>Syötä kokonaisluku.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="112">
|
||||||
|
<source>Please select a valid language.</source>
|
||||||
|
<target>Valitse kelvollinen kieli.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="113">
|
||||||
|
<source>Please select a valid locale.</source>
|
||||||
|
<target>Valitse kelvollinen kielikoodi.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="114">
|
||||||
|
<source>Please enter a valid money amount.</source>
|
||||||
|
<target>Syötä kelvollinen rahasumma.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="115">
|
||||||
|
<source>Please enter a number.</source>
|
||||||
|
<target>Syötä numero.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="116">
|
||||||
|
<source>The password is invalid.</source>
|
||||||
|
<target>Salasana ei kelpaa.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="117">
|
||||||
|
<source>Please enter a percentage value.</source>
|
||||||
|
<target>Syötä prosenttiluku.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="118">
|
||||||
|
<source>The values do not match.</source>
|
||||||
|
<target>Arvot eivät vastaa toisiaan.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="119">
|
||||||
|
<source>Please enter a valid time.</source>
|
||||||
|
<target>Syötä kelvollinen kellonaika.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="120">
|
||||||
|
<source>Please select a valid timezone.</source>
|
||||||
|
<target>Valitse kelvollinen aikavyöhyke.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="121">
|
||||||
|
<source>Please enter a valid URL.</source>
|
||||||
|
<target>Syötä kelvollinen URL.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="122">
|
||||||
|
<source>Please enter a valid search term.</source>
|
||||||
|
<target>Syötä kelvollinen hakusana.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="123">
|
||||||
|
<source>Please provide a valid phone number.</source>
|
||||||
|
<target>Anna kelvollinen puhelinnumero.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="124">
|
||||||
|
<source>The checkbox has an invalid value.</source>
|
||||||
|
<target>Valintaruudun arvo ei kelpaa.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="125">
|
||||||
|
<source>Please enter a valid email address.</source>
|
||||||
|
<target>Syötä kelvollinen sähköpostiosoite.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="126">
|
||||||
|
<source>Please select a valid option.</source>
|
||||||
|
<target>Valitse kelvollinen vaihtoehto.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="127">
|
||||||
|
<source>Please select a valid range.</source>
|
||||||
|
<target>Valitse kelvollinen väli.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="128">
|
||||||
|
<source>Please enter a valid week.</source>
|
||||||
|
<target>Syötä kelvollinen viikko.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
|
Reference in New Issue
Block a user