remove locales config (fixes KnpLabs#120)

EmmanuelVella · Aug 9, 2013 · 52e0ae9 · 52e0ae9
1 parent d97cf76
commit 52e0ae9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/DependencyInjection/CmfMenuExtension.php b/DependencyInjection/CmfMenuExtension.php
@@ -25,15 +25,6 @@ public function load(array $configs, ContainerBuilder $container)
         $factory->replaceArgument(1, new Reference($config['content_url_generator']));
         $container->setParameter($this->getAlias() . '.allow_empty_items', $config['allow_empty_items']);
 
-        $locales = array();
-        if (isset($config['multilang'])) {
-            $locales = $config['multilang']['locales'];
-        }
-        $container->setParameter(
-            $this->getAlias() . '.multilang.locales',
-            $locales
-        );
-
         $this->loadVoters($config, $loader, $container);
 
         if (!empty($config['persistence']['phpcr']['enabled'])) {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -50,17 +50,6 @@ public function getConfigTreeBuilder()
                         ->scalarNode('uri_prefix')->defaultFalse()->end()
                     ->end()
                 ->end()
-
-                ->arrayNode('multilang')
-                    ->fixXmlConfig('locale')
-                    ->children()
-                        ->arrayNode('locales')
-                            ->isRequired()
-                            ->requiresAtLeastOneElement()
-                            ->prototype('scalar')->end()
-                        ->end()
-                    ->end()
-                ->end()
             ->end()
         ;
 

diff --git a/Resources/config/admin.xml b/Resources/config/admin.xml
@@ -26,7 +26,6 @@
             <argument/>
             <argument>%cmf_menu.persistence.phpcr.menu_document.class%</argument>
             <argument>SonataAdminBundle:CRUD</argument>
-            <argument>%cmf_menu.multilang.locales%</argument>
 
             <call method="setRouteBuilder">
                 <argument type="service" id="sonata.admin.route.path_info_slashes" />
@@ -58,7 +57,6 @@
             <argument/>
             <argument>%cmf_menu.persistence.phpcr.node_document.class%</argument>
             <argument>SonataAdminBundle:CRUD</argument>
-            <argument>%cmf_menu.multilang.locales%</argument>
 
             <call method="setRouteBuilder">
                 <argument type="service" id="sonata.admin.route.path_info_slashes" />

diff --git a/Resources/config/schema/menu-1.0.xsd b/Resources/config/schema/menu-1.0.xsd
@@ -10,7 +10,6 @@
     <xsd:complexType name="config">
         <xsd:sequence>
             <xsd:element name="voter" type="voter" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="multilang" type="multilang" minOccurs="0" />
             <xsd:element name="persistence" type="persistence" minOccurs="0"/>
         </xsd:sequence>
 
@@ -46,12 +45,6 @@
         <xsd:attribute name="content-key" type="xsd:string" />
     </xsd:complexType>
 
-    <xsd:complexType name="multilang">
-        <xsd:sequence>
-            <xsd:element name="locale" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
-        </xsd:sequence>
-    </xsd:complexType>
-
     <xsd:simpleType name="use_sonata_admin">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="true" />