fixed order of translation files registration
This commit is contained in:
parent
76b2ed46d6
commit
f65ade24b2
@ -530,6 +530,16 @@ class FrameworkExtension extends Extension
|
|||||||
|
|
||||||
// Discover translation directories
|
// Discover translation directories
|
||||||
$dirs = array();
|
$dirs = array();
|
||||||
|
if (class_exists('Symfony\Component\Validator\Validator')) {
|
||||||
|
$r = new \ReflectionClass('Symfony\Component\Validator\Validator');
|
||||||
|
|
||||||
|
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
|
||||||
|
}
|
||||||
|
if (class_exists('Symfony\Component\Form\Form')) {
|
||||||
|
$r = new \ReflectionClass('Symfony\Component\Form\Form');
|
||||||
|
|
||||||
|
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
|
||||||
|
}
|
||||||
$overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
|
$overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
|
||||||
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
|
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
|
||||||
$reflection = new \ReflectionClass($class);
|
$reflection = new \ReflectionClass($class);
|
||||||
@ -543,16 +553,6 @@ class FrameworkExtension extends Extension
|
|||||||
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
|
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
|
||||||
$dirs[] = $dir;
|
$dirs[] = $dir;
|
||||||
}
|
}
|
||||||
if (class_exists('Symfony\Component\Validator\Validator')) {
|
|
||||||
$r = new \ReflectionClass('Symfony\Component\Validator\Validator');
|
|
||||||
|
|
||||||
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
|
|
||||||
}
|
|
||||||
if (class_exists('Symfony\Component\Form\Form')) {
|
|
||||||
$r = new \ReflectionClass('Symfony\Component\Form\Form');
|
|
||||||
|
|
||||||
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register translation resources
|
// Register translation resources
|
||||||
if ($dirs) {
|
if ($dirs) {
|
||||||
|
Reference in New Issue
Block a user