fixed order of translation files registration

fabpot · fabpot · commit f65ade24b25d · 2012-06-16T18:09:40.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -530,6 +530,16 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             // Discover translation directories
             $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';
             foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
                 $reflection = new \ReflectionClass($class);
@@ -543,16 +553,6 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
                 $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
             if ($dirs) {
