Cleanup

Add locale, locales and languages config keys

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 4e20178c2d0cb38cecfd72d63067a3d4222404e5..ed548930491976dece8beb5c34416ea9ef17088c 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -65,14 +65,16 @@ class Configuration implements ConfigurationInterface {
                                'url' => 'rapsys_air'
                        ],
                        'copy' => [
                                'url' => 'rapsys_air'
                        ],
                        'copy' => [

-                               'long' => 'John Doe all rights reserved',
+                               'long' => 'All rights reserved',

                                'short' => 'Copyright 2019'
                        ],
                        'contact' => [
                                'name' => 'John Doe',
                                'mail' => 'contact@example.com'
                        ],
                                'short' => 'Copyright 2019'
                        ],
                        'contact' => [
                                'name' => 'John Doe',
                                'mail' => 'contact@example.com'
                        ],

-                       'locales' => '%kernel.translator.fallbacks%'
+                       'locale' => '%kernel.default_locale%',
+                       'locales' => '%kernel.translator.fallbacks%',
+                       'languages' => '%rapsys_user.languages%',

                ];
 
                //Here we define the parameters that are allowed to configure the bundle.
                ];
 
                //Here we define the parameters that are allowed to configure the bundle.


@@ -115,7 +117,14 @@ class Configuration implements ConfigurationInterface {
                                                        ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
                                                ->end()
                                        ->end()
                                                        ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
                                                ->end()
                                        ->end()

+                                       ->scalarNode('locale')->cannotBeEmpty()->defaultValue($defaults['locale'])->end()

                                        ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
                                        ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()

+                                       ->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->end()
+                                       /*->arrayNode('languages')
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['languages'])
+                                               ->scalarPrototype()->end()
+                                       ->end()*/

                                ->end()
                        ->end();
 
                                ->end()
                        ->end();
 

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index ba082de0542fc5db1a22a2f54e160c15a4b2410d..e00159b340f0724418d525736cd9e24e421dab66 100644 (file)
--- a/DependencyInjection/RapsysAirExtension.php
+++ b/DependencyInjection/RapsysAirExtension.php
@@ -36,6 +36,25 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
                //Set translator fallbacks
                $container->setParameter('kernel.translator.fallbacks', $framework['translator']['fallbacks']);
 
                //Set translator fallbacks
                $container->setParameter('kernel.translator.fallbacks', $framework['translator']['fallbacks']);
 

+               //Set default locale
+               $container->setParameter('kernel.default_locale', $framework['default_locale']);
+
+               //Load rapsys_user configurations
+               //XXX: required to extract default_locale and translation.fallbacks
+               $rapsys_users = $container->getExtensionConfig('rapsys_user');
+
+               //Recursively merge rapsys_user configurations
+               $rapsys_user = array_reduce(
+                       $rapsys_users,
+                       function ($res, $i) {
+                               return array_merge_recursive($res, $i);
+                       },
+                       []
+               );
+
+               //Set rapsys_user.languages key
+               $container->setParameter('rapsys_user.languages', $rapsys_user['languages']);
+

                //Process the configuration
                $configs = $container->getExtensionConfig($this->getAlias());
 
                //Process the configuration
                $configs = $container->getExtensionConfig($this->getAlias());
 


@@ -56,7 +75,7 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
 
                //Store flattened array in parameters
                //XXX: don't flatten rapsys_air.site.png key which is required to be an array
 
                //Store flattened array in parameters
                //XXX: don't flatten rapsys_air.site.png key which is required to be an array

-               foreach($this->flatten($config, $this->getAlias(), 10, '.', ['rapsys_air.site.png', 'rapsys_air.locales']) as $k => $v) {
+               foreach($this->flatten($config, $this->getAlias(), 10, '.', ['rapsys_air.site.png', 'rapsys_air.locales', 'rapsys_air.languages']) as $k => $v) {

                        $container->setParameter($k, $v);
                }
        }
                        $container->setParameter($k, $v);
                }
        }