Merge branch '3.4' into 4.2
* 3.4: relax assertions in tests [Validator] Translate messages into Japanese Fix Thai translation in validators.th.xlf [FramworkBundle] mark any env vars found in the ide setting as used
This commit is contained in:
commit
7c9dffe2e5
@ -2413,11 +2413,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]
|
||||
'
|
||||
);
|
||||
@ -2434,7 +2430,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]
|
||||
'
|
||||
);
|
||||
|
@ -193,6 +193,8 @@ class FrameworkExtension extends Extension
|
||||
'vscode' => 'vscode://file/%%f:%%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));
|
||||
}
|
||||
|
@ -330,6 +330,38 @@
|
||||
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
|
||||
<target>このSWIFTコードはIBANコード({{ iban }})に関連付けられていません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="86">
|
||||
<source>This value should be valid JSON.</source>
|
||||
<target>JSONでなければなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="87">
|
||||
<source>This collection should contain only unique elements.</source>
|
||||
<target>要素は重複してはなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="88">
|
||||
<source>This value should be positive.</source>
|
||||
<target>正の数でなければなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="89">
|
||||
<source>This value should be either positive or zero.</source>
|
||||
<target>正の数、または0でなければなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="90">
|
||||
<source>This value should be negative.</source>
|
||||
<target>負の数でなければなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="91">
|
||||
<source>This value should be either negative or zero.</source>
|
||||
<target>負の数、または0でなければなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="92">
|
||||
<source>This value is not a valid timezone.</source>
|
||||
<target>有効なタイムゾーンではありません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="93">
|
||||
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
|
||||
<target>このパスワードは漏洩している為使用できません。</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
@ -152,7 +152,7 @@
|
||||
</trans-unit>
|
||||
<trans-unit id="41">
|
||||
<source>This value is already used.</source>
|
||||
<target>Tค่านี้ถูกใช้งานไปแล้ว</target>
|
||||
<target>ค่านี้ถูกใช้งานไปแล้ว</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="42">
|
||||
<source>The size of the image could not be detected.</source>
|
||||
|
Reference in New Issue
Block a user