[FrameworkBundle] fixed regression for the translator fallback configuration (refs #7100, closes #7315)
This commit is contained in:
parent
ea252671b0
commit
44c865418f
@ -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
|
||||
|
@ -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]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user