From e461d36ec45e449ea52eb91ce9e3814c76a92cf0 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 28 Apr 2019 11:46:42 +0200 Subject: [PATCH 1/4] [FramworkBundle] mark any env vars found in the ide setting as used --- .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index ee5dc86df2..4e792ded2e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -212,6 +212,8 @@ class FrameworkExtension extends Extension 'phpstorm' => 'phpstorm://open?file=%%f&line=%%l', ]; $ide = $config['ide']; + // mark any env vars found in the ide setting as used + $container->resolveEnvPlaceholders($ide); $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide)); } From d4337fc8a281572b15729ac4702c1ddb8a3497ae Mon Sep 17 00:00:00 2001 From: MrNicodemuz Date: Mon, 29 Apr 2019 10:05:10 +0800 Subject: [PATCH 2/4] Fix Thai translation in validators.th.xlf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The translated message is wrongly prefixed with a "T" character. The correct translation should read as "ค่านี้ถูกใช้งานไปแล้ว". --- .../Validator/Resources/translations/validators.th.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf index d5b57031b9..63ce95ab1b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf @@ -152,7 +152,7 @@ This value is already used. - Tค่านี้ถูกใช้งานไปแล้ว + ค่านี้ถูกใช้งานไปแล้ว The size of the image could not be detected. From e6e98363b0bdc4754897476774f10c9351920edf Mon Sep 17 00:00:00 2001 From: "Issei.M" Date: Mon, 29 Apr 2019 17:17:01 +0900 Subject: [PATCH 3/4] [Validator] Translate messages into Japanese --- .../Resources/translations/validators.ja.xlf | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index 207d4ba7ae..5a391a2e66 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -330,6 +330,38 @@ This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. このSWIFTコードはIBANコード（{{ iban }}）に関連付けられていません。 + + This value should be valid JSON. + JSONでなければなりません。 + + + This collection should contain only unique elements. + 要素は重複してはなりません。 + + + This value should be positive. + 正の数でなければなりません。 + + + This value should be either positive or zero. + 正の数、または0でなければなりません。 + + + This value should be negative. + 負の数でなければなりません。 + + + This value should be either negative or zero. + 負の数、または0でなければなりません。 + + + This value is not a valid timezone. + 有効なタイムゾーンではありません。 + + + This password has been leaked in a data breach, it must not be used. Please use another password. + このパスワードは漏洩している為使用できません。 + From 730df0860c85d186a19aafb02c7791c644ab94cd Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 30 Apr 2019 14:16:44 +0200 Subject: [PATCH 4/4] relax assertions in tests --- .../Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php index e50076da73..183cd820c3 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php @@ -2376,11 +2376,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest [@name="name"] [@class="my&class form-control"] [not(@required)] - [./optgroup - [@label="Europe"] - [./option[@value="Europe/Vienna"][@selected="selected"][.="Vienna"]] - ] - [count(./optgroup)>10] + [.//option[@value="Europe/Vienna"][@selected="selected"]] [count(.//option)>200] ' ); @@ -2397,7 +2393,6 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest '/select [@class="my&class form-control"] [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]] - [count(./optgroup)>10] [count(.//option)>201] ' );