symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+6-8 b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+6-8
diff --git a/‎src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
-71 b/‎src/Symfony/Component/Security/Core/Resources/translations/security.az.xlf
-71
diff --git a/‎src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
-71 b/‎src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf
-71
@@ -553,16 +553,14 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
             $r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
 
-            // with Symfony 2.4, the Security component was split into several subpackages
-            // and the translations have been moved to the symfony/security-core package
-            $translationsDir = dirname($r->getFilename()).'/../Resources/translations';
-
-            if (!file_exists($translationsDir) && file_exists($dir = dirname($r->getFilename()).'/../../Resources/translations')) {
+            if (file_exists(dirname($r->getFilename()).'/../composer.json')) {
+                // with Symfony 2.4, the Security component was split into several subpackages
+                // and the translations have been moved to the symfony/security-core package
+                $dirs[] = dirname($r->getFilename()).'/../Resources/translations';
+            } else {
                 // in Symfony 2.3, translations are located in the symfony/security package
-                $translationsDir = $dir;
+                $dirs[] = dirname($r->getFilename()).'/../../Resources/translations';
             }
-
-            $dirs[] = $translationsDir;
         }
         $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
         foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {