Skip to content

Commit edf351e

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: Typo fix [2.3] Static Code Analysis for Components Added support \IteratorAggregate for UniqueEntityValidator Fix #17306 Paths with % in it are note allowed (like urlencoded) Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class
2 parents 676f493 + ec75d28 commit edf351e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,17 +685,17 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
685685

686686
$dirs[] = dirname($r->getFileName()).'/../Resources/translations';
687687
}
688-
$overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
688+
$rootDir = $container->getParameter('kernel.root_dir');
689689
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
690690
$reflection = new \ReflectionClass($class);
691691
if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
692692
$dirs[] = $dir;
693693
}
694-
if (is_dir($dir = sprintf($overridePath, $bundle))) {
694+
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) {
695695
$dirs[] = $dir;
696696
}
697697
}
698-
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
698+
if (is_dir($dir = $rootDir.'/Resources/translations')) {
699699
$dirs[] = $dir;
700700
}
701701

0 commit comments

Comments
 (0)