Commit de674e6d authored by Fabien Potencier's avatar Fabien Potencier

removed deprecated locale_fallback setting

parent 24bce51f
......@@ -33,14 +33,7 @@ class TranslationServiceProvider implements ServiceProviderInterface
}
$translator = new Translator($app, $app['translator.message_selector']);
// Handle deprecated 'locale_fallback'
if (isset($app['locale_fallback'])) {
$app['locale_fallbacks'] = (array) $app['locale_fallback'];
}
$translator->setFallbackLocales($app['locale_fallbacks']);
$translator->addLoader('array', new ArrayLoader());
$translator->addLoader('xliff', new XliffFileLoader());
......
......@@ -104,15 +104,6 @@ class TranslationServiceProviderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $result);
}
public function testBackwardCompatiblityForFallback()
{
$app = $this->getPreparedApp();
$app['locale_fallback'] = 'de';
$result = $app['translator']->trans('key1', array(), null, 'ru');
$this->assertEquals('The german translation', $result);
}
public function testFallbacks()
{
$app = $this->getPreparedApp();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment