Merge pull request #163 from Rvanlaak/master

Allow bundle to override default_locale
a2lix · Dec 2, 2014 · 390e327 · 390e327
2 parents 72936f6 + e6e8f76
commit 390e327
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/DependencyInjection/A2lixTranslationFormExtension.php b/DependencyInjection/A2lixTranslationFormExtension.php
@@ -30,8 +30,9 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('a2lix_translation_form.locale_provider', $config['locale_provider']);
         $container->setParameter('a2lix_translation_form.locales', $config['locales']);
-        $container->setParameter('a2lix_translation_form.default_locale', $container->getParameter('kernel.default_locale', 'en'));
         $container->setParameter('a2lix_translation_form.required_locales', $config['required_locales']);
+        $container->setParameter('a2lix_translation_form.default_locale', $config['default_locale'] ?: 
+            $container->getParameter('kernel.default_locale', 'en'));
 
         $container->setParameter('a2lix_translation_form.templating', $config['templating']);
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,6 +22,7 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->scalarNode('locale_provider')->defaultValue('default')->end()
+                ->scalarNode('default_locale')->defaultNull()->end()
                 ->arrayNode('locales')
                     ->beforeNormalization()
                         ->ifString()