From: Raphaƫl Gertz Date: Mon, 28 Dec 2020 07:38:47 +0000 (+0100) Subject: Cleanup X-Git-Tag: 0.1.7~23 X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/commitdiff_plain/28d443906d7ec95c43bd570f8fe666a28aefbacf?ds=sidebyside Cleanup Add locale, locales and languages config keys --- diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php index ba082de..e00159b 100644 --- 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 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()); @@ -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 - 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); } }