Merge pull request #245 from symfony-cmf/issue_240

Fix link type choice options

Author: wouterj

Admin/MenuNodeAdmin.php

@@ -55,9 +55,14 @@ protected function configureFormFields(FormMapper $formMapper)
             $formMapper
                 ->with('form.group_general')
                     ->add('linkType', 'choice_field_mask', array(
+                        'choices' => array(
+                            'route' => 'route',
+                            'uri' => 'uri',
+                            'content' => 'content',
+                        ),
                         'map' => array(
-                            'route' => array('route'),
-                            'uri' => array('uri'),
+                            'route' => array('link'),
+                            'uri' => array('link'),
                             'content' => array('content', 'doctrine_phpcr_odm_tree'),
                         ),
                         'empty_value' => 'auto',

Resources/translations/CmfMenuBundle.de.xliff

@@ -106,6 +106,10 @@
         <source>form.label_link_type</source>
         <target>Linktyp</target>
       </trans-unit>
+      <trans-unit id="form.label_link">
+        <source>form.label_link</source>
+        <target>Link</target>
+      </trans-unit>
       <trans-unit id="show.label_id">
         <source>show.label_id</source>
         <target>Id</target>

Resources/translations/CmfMenuBundle.en.xliff

@@ -110,6 +110,10 @@
         <source>form.label_link_type</source>
         <target>Link type</target>
       </trans-unit>
+      <trans-unit id="form.label_link">
+        <source>form.label_link</source>
+        <target>Link</target>
+      </trans-unit>
       <trans-unit id="form.label_weak">
         <source>form.label_weak</source>
         <target>Weak association</target>