From 44c865418f9961a5a4f62eb5560b982f743137d1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 11 Mar 2013 22:59:35 +0100 Subject: [PATCH] [FrameworkBundle] fixed regression for the translator fallback configuration (refs #7100, closes #7315) --- .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 3 +++ .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index d1699672dd5c..247222c95dcf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -533,6 +533,9 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder // Use the "real" translator instead of the identity default $container->setAlias('translator', 'translator.default'); $translator = $container->findDefinition('translator.default'); + if (!is_array($config['fallback'])) { + $config['fallback'] = array($config['fallback']); + } $translator->addMethodCall('setFallbackLocales', array($config['fallback'])); // Discover translation directories diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 0706eb02b36f..718a0f77bf37 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -219,7 +219,7 @@ public function testTranslator() ); $calls = $container->getDefinition('translator.default')->getMethodCalls(); - $this->assertEquals('fr', $calls[0][1][0]); + $this->assertEquals(array('fr'), $calls[0][1][0]); } /**