Skip to content

Commit 2abf3c9

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents e6c156d + b33c743 commit 2abf3c9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Translation/TwigExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getExtractData()
8282
['{{ ("another " ~ "new " ~ "key") | trans() }}', ['another new key' => 'messages']],
8383
['{{ ("new" ~ " key") | trans(domain="domain") }}', ['new key' => 'domain']],
8484
['{{ ("another " ~ "new " ~ "key") | trans(domain="domain") }}', ['another new key' => 'domain']],
85-
// if it has a variable or other expression, we can not extract it
85+
// if it has a variable or other expression, we cannot extract it
8686
['{% set foo = "new" %} {{ ("new " ~ foo ~ "key") | trans() }}', []],
8787
['{{ ("foo " ~ "new"|trans ~ "key") | trans() }}', ['new' => 'messages']],
8888
];

0 commit comments

Comments
 (0)