Merge pull request #155 from KingCrunch/merge-menus

lsmith77 · lsmith77 · commit 69b2a19c81b2 · 2013-08-21T06:26:22.000-07:00
Merge admin-menu entries into a single 'CMF'-menu
diff --git a/Resources/config/admin-phpcr.xml b/Resources/config/admin-phpcr.xml
@@ -15,7 +15,7 @@
     <services>
 
         <service id="cmf_routing.route_admin" class="%cmf_routing.route_admin_class%">
-            <tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.group_routing" label_catalogue="CmfRoutingBundle" label="dashboard.label_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
+            <tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.cmf" label_catalogue="CmfRoutingBundle" label="dashboard.label_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
             <argument/>
             <argument>%cmf_routing.route_document_class%</argument>
             <argument>SonataAdminBundle:CRUD</argument>
@@ -37,7 +37,7 @@
         </service>
 
         <service id="cmf_routing.redirect_route_admin" class="%cmf_routing.redirect_route_admin_class%">
-            <tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.group_routing" label_catalogue="CmfRoutingBundle" label="dashboard.label_redirect_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
+            <tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.cmf" label_catalogue="CmfRoutingBundle" label="dashboard.label_redirect_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
             <argument/>
             <argument>%cmf_routing.redirect_route_document_class%</argument>
             <argument>SonataAdminBundle:CRUD</argument>
diff --git a/Resources/translations/CmfRoutingBundle.de.xliff b/Resources/translations/CmfRoutingBundle.de.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="de" datatype="plaintext" original="CmfRoutingBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_routing">
-        <source>dashboard.group_routing</source>
-        <target>Routen</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_routing">
         <source>dashboard.label_routing</source>
diff --git a/Resources/translations/CmfRoutingBundle.en.xliff b/Resources/translations/CmfRoutingBundle.en.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="en" datatype="plaintext" original="CmfRoutingBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_routing">
-        <source>dashboard.group_routing</source>
-        <target>Routing</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_routing">
         <source>dashboard.label_routing</source>
diff --git a/Resources/translations/CmfRoutingBundle.fr.xliff b/Resources/translations/CmfRoutingBundle.fr.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="fr" datatype="plaintext" original="CmfRoutingBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_routing">
-        <source>dashboard.group_routing</source>
-        <target>Routage</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_routing">
         <source>dashboard.label_routing</source>
diff --git a/Resources/translations/CmfRoutingBundle.pl.xliff b/Resources/translations/CmfRoutingBundle.pl.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="pl" datatype="plaintext" original="CmfRoutingBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_routing">
-        <source>dashboard.group_routing</source>
-        <target>Ścieżki</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_routing">
         <source>dashboard.label_routing</source>
