Switch to new full locale naming

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 63ba75f5c9cc4966bf6dce917c211b781b2a3028..7b965a056fb34dd8970de73411bcb24605324767 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -22,11 +22,11 @@ class Configuration implements ConfigurationInterface {
                $defaults = [
                        'class' => [
                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',
                $defaults = [
                        'class' => [
                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',

-                               'title' => 'Rapsys\\UserBundle\\Entity\\Title',
+                               'civility' => 'Rapsys\\UserBundle\\Entity\\Civility',

                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [
                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [

-                               'title' => 'Mister',
+                               'civility' => 'Mister',

                                'group' => [ 'User' ]
                        ],
                        'route' => [
                                'group' => [ 'User' ]
                        ],
                        'route' => [


@@ -51,6 +51,11 @@ class Configuration implements ConfigurationInterface {
                                        'context' => []
                                ]
                        ],
                                        'context' => []
                                ]
                        ],

+                       'translate' => [],
+                       'locales' => '%kernel.translator.fallbacks%',
+                       'languages' => [
+                               'en-gb' => 'English'
+                       ],

                        'contact' => [
                                'name' => 'John Doe',
                                'mail' => 'contact@example.com'
                        'contact' => [
                                'name' => 'John Doe',
                                'mail' => 'contact@example.com'


@@ -123,14 +128,14 @@ class Configuration implements ConfigurationInterface {
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()

-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['class']['title'])->end()
+                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()

                                                        ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
                                                ->end()
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
                                                ->end()
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()
                                                ->children()

-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['default']['title'])->end()
+                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()

                                                        ->arrayNode('group')
                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['default']['group'])
                                                        ->arrayNode('group')
                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['default']['group'])


@@ -198,6 +203,17 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                ->end()
                                        ->end()
                                                        ->end()
                                                ->end()
                                        ->end()

+                                       ->arrayNode('translate')
+                                               ->treatNullLike(array())
+                                               ->defaultValue($defaults['translate'])
+                                               ->scalarPrototype()->end()
+                                       ->end()
+                                       ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
+                                       ->arrayNode('languages')
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['languages'])
+                                               ->scalarPrototype()->end()
+                                       ->end()

                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()