10000 Merge branch '3.4' into 4.2 · symfony/symfony@454574b · GitHub
[go: up one dir, main page]
Skip to content

Commit 454574b

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.2
* 3.4: [TwigBridge] Require twig ^1.40|^2.9 [Serializer] Fix tests Use the apply tag instead of the filter tag Updated some translation files [Translator] Preserve default domain when extracting strings from php files
2 parents 7947b26 + c3f57d0 commit 454574b

File tree

11 files changed

+113
-10
lines changed

11 files changed

+113
-10
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"doctrine/event-manager": "~1.0",
2323
"doctrine/persistence": "~1.0",
2424
"fig/link-util": "^1.0",
25-
"twig/twig": "^1.35|^2.4.4",
25+
"twig/twig": "^1.40|^2.9",
2626
"psr/cache": "~1.0",
2727
"psr/container": "^1.0",
2828
"psr/link": "^1.0",

‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
use Twig\Node\Node;
2525
use Twig\Node\SetNode;
2626
use Twig\NodeVisitor\AbstractNodeVisitor;
27-
use Twig\TokenParser\ApplyTokenParser;
2827

2928
/**
3029
* @author Fabien Potencier <fabien@symfony.com>
@@ -96,8 +95,7 @@ protected function doEnterNode(Node $node, Environment $env)
9695
protected function doLeaveNode(Node $node, Environment $env)
9796
{
9897
if ($node instanceof TransDefaultDomainNode) {
99-
// must return null as of Twig 2.9
100-
return class_exists(ApplyTokenParser::class) ? null : false;
98+
return null;
10199
}
102100

103101
if ($node instanceof BlockNode || $node instanceof ModuleNode) {

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/contracts": "^1.0.2",
21-
"twig/twig": "^1.38.1|^2.7.1"
21+
"twig/twig": "^1.40|^2.9"
2222
},
2323
"require-dev": {
2424
"symfony/asset": "~3.4|~4.0",

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<td>
2020
{% if exception.trace|length %}
2121
<pre class="stacktrace">
22-
{%- filter escape('html') -%}
22+
{%- apply escape('html') -%}
2323
{{- include('@Twig/Exception/traces.txt.twig', { exception: exception, format: 'html' }, with_context = false) }}
24-
{%- endfilter -%}
24+
{%- endapply -%}
2525
</pre>
2626
{% endif %}
2727
</td>

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-foundation": "~4.1",
2323
"symfony/http-kernel": "~4.1",
2424
"symfony/polyfill-ctype": "~1.8",
25-
"twig/twig": "~1.34|~2.4"
25+
"twig/twig": "~1.40|~2.9"
2626
},
2727
"require-dev": {
2828
"symfony/asset": "~3.4|~4.0",

‎src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0"?>
2+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
3+
<file source-language="en" datatype="plaintext" original="file.ext">
4+
<body>
5+
<trans-unit id="1">
6+
<source>An authentication exception occurred.</source>
7+
<target>Autentifikazio-errorea gertatu da.</target>
8+
</trans-unit>
9+
<trans-unit id="2">
10+
<source>Authentication credentials could not be found.</source>
11+
<target>Ez dira aurkitu autentifikazio-kredentzialak.</target>
12+
</trans-unit>
13+
<trans-unit id="3">
14+
<source>Authentication request could not be processed due to a system problem.</source>
15+
<target>Ezin izan da autentifikazio-eskaera prozesatu, sistema-arazo bat gertatu da eta.</target>
16+
</trans-unit>
17+
<trans-unit id="4">
18+
<source>Invalid credentials.</source>
19+
<target>Kredentzialak okerrak dira.</target>
20+
</trans-unit>
21+
<trans-unit id="5">
22+
<source>Cookie has already been used by someone else.</source>
23+
<target>Dagoeneko beste pertsona batek erabili du cookiea.</target>
24+
</trans-unit>
25+
<trans-unit id="6">
26+
<source>Not privileged to request the resource.</source>
27+
<target>Ez duzu baliabidea eskatzeko aukerarik.</target>
28+
</trans-unit>
29+
<trans-unit id="7">
30+
<source>Invalid CSRF token.</source>
31+
<target>CSRF tokena okerra da.</target>
32+
</trans-unit>
33+
<trans-unit id="9">
34+
<source>No authentication provider found to support the authentication token.</source>
35+
<target>Ez da aurkitu autentifikazio-tokena eutsi dezakeen autentifikazio-hornitzailerik.</target>
36+
</trans-unit>
37+
<trans-unit id="10">
38+
<source>No session available, it either timed out or cookies are not enabled.</source>
39+
<target>Ez dago saiorik erabilgarri, iraungi egin da edo cookieak ez daude gaituta.</target>
40+
</trans-unit>
41+
<trans-unit id="11">
42+
<source>No token could be found.</source>
43+
<target>Ez da tokenik aurkitu.</target>
44+
</trans-unit>
45+
<trans-unit id="12">
46+
<source>Username could not be found.</source>
47+
<target>Ez da erabiltzaile-izena aurkitu.</target>
48+
</trans-unit>
49+
<trans-unit id="13">
50+
<source>Account has expired.</source>
51+
<target>Kontua iraungi da.</target>
52+
</trans-unit>
53+
<trans-unit id="14">
54+
<source>Credentials have expired.</source>
55+
<target>Kredentzialak iraungi dira.</target>
56+
</trans-unit>
57+
<trans-unit id="15">
58+
<source>Account is disabled.</source>
59+
<target>Kontua desgaituta dago.</target>
60+
</trans-unit>
61+
<trans-unit id="16">
62+
<source>Account is locked.</source>
63+
<target>Kontua blokeatuta dago.</target>
64+
</trans-unit>
65+
</body>
66+
</file>
67+
</xliff>

‎src/Symfony/Component/Serializer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/property-access": "~3.4|~4.0",
2626
"symfony/http-foundation": "~3.4|~4.0",
2727
"symfony/cache": "~3.4|~4.0",
28-
"symfony/property-info": "~3.4|~4.0",
28+
"symfony/property-info": "^3.4.13|~4.0",
2929
"symfony/validator": "~3.4|~4.0",
3030
"doctrine/annotations": "~1.0",
3131
"symfony/dependency-injection": "~3.4|~4.0",

‎src/Symfony/Component/Translation/Extractor/PhpExtractor.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
224224
} elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
225225
$this->skipMethodArgument($tokenIterator);
226226
} elseif (self::DOMAIN_TOKEN === $item) {
227-
$domain = $this->getValue($tokenIterator);
227+
$domainToken = $this->getValue($tokenIterator);
228+
if ('' !== $domainToken) {
229+
$domain = $domainToken;
230+
}
228231

229232
break;
230233
} else {

‎src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public function testExtraction($resource)
5252
$expectedNowdoc => 'prefix'.$expectedNowdoc,
5353
'{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
5454
'concatenated message with heredoc and nowdoc' => 'prefixconcatenated message with heredoc and nowdoc',
55+
'default domain' => 'prefixdefault domain',
5556
],
5657
'not_messages' => [
5758
'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array',

‎src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@
5555
<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
5656
<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
5757
<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>
58+
59+
<?php echo $view['translator']->trans('default domain', [], null); ?>

‎src/Symfony/Component/Validator/Resources/translations/validators.es.xlf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,38 @@
330330
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
331331
<target>Este Código de Identificación Bancaria (BIC) no está asociado con el IBAN {{ iban }}.</target>
332332
</trans-unit>
333+
<trans-unit id="86">
334+
<source>This value should be valid JSON.</source>
335+
<target>Este valor debería ser un JSON válido.</target>
336+
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Esta colección debería tener exclusivamente elementos únicos.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>Este valor debería ser positivo.</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>Este valor debería ser positivo o igual a cero.</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>Este valor debería ser negativo.</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>Este valor debería ser negativo o igual a cero.</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Este valor no es una zona horaria válida.</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Esta contraseña no se puede utilizar porque está incluida en un listado de contraseñas públicas obtenido gracias a fallos de seguridad de otros sitios y aplicaciones. Por favor utilice otra contraseña.</target>
364+
</trans-unit>
333365
</body>
334366
</file>
335367
</xliff>

0 commit comments

Comments
 (0)
0