diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index d1699672dd..247222c95d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -533,6 +533,9 @@ class FrameworkExtension extends Extension // 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 0706eb02b3..718a0f77bf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -219,7 +219,7 @@ abstract class FrameworkExtensionTest extends TestCase ); $calls = $container->getDefinition('translator.default')->getMethodCalls(); - $this->assertEquals('fr', $calls[0][1][0]); + $this->assertEquals(array('fr'), $calls[0][1][0]); } /**