avoid a weird testing failure with latest symfony 2.3, fix translations for sonata

Author: dbu

Resources/translations/CmfRoutingBundle.de.xliff

@@ -50,9 +50,9 @@
         <source>filter.label_name</source>
         <target>Name</target>
       </trans-unit>
-      <trans-unit id="list.label_path">
-        <source>list.label_path</source>
-        <target>Pfad</target>
+      <trans-unit id="list.label_id">
+        <source>list.label_id</source>
+        <target>Id</target>
       </trans-unit>
       <trans-unit id="form.group_general">
         <source>form.group_general</source>
@@ -70,8 +70,8 @@
         <source>form.label_variable_pattern</source>
         <target>Variablenmuster</target>
       </trans-unit>
-      <trans-unit id="form.label_route_content">
-        <source>form.label_route_content</source>
+      <trans-unit id="form.label_content">
+        <source>form.label_content</source>
         <target>Inhalt</target>
       </trans-unit>
       <trans-unit id="form.label_defaults">

Resources/translations/CmfRoutingBundle.en.xliff

@@ -50,9 +50,9 @@
         <source>filter.label_name</source>
         <target>Name</target>
       </trans-unit>
-      <trans-unit id="list.label_path">
-        <source>list.label_path</source>
-        <target>Path</target>
+      <trans-unit id="list.label_id">
+        <source>list.label_id</source>
+        <target>Id</target>
       </trans-unit>
       <trans-unit id="form.group_general">
         <source>form.group_general</source>
@@ -70,8 +70,8 @@
         <source>form.label_variable_pattern</source>
         <target>Variable pattern</target>
       </trans-unit>
-      <trans-unit id="form.label_route_content">
-        <source>form.label_route_content</source>
+      <trans-unit id="form.label_content">
+        <source>form.label_content</source>
         <target>Content</target>
       </trans-unit>
       <trans-unit id="form.label_defaults">

Resources/translations/CmfRoutingBundle.fr.xliff

@@ -50,9 +50,9 @@
         <source>filter.label_name</source>
         <target>Nom</target>
       </trans-unit>
-      <trans-unit id="list.label_path">
-        <source>list.label_path</source>
-        <target>Chemin</target>
+      <trans-unit id="list.label_id">
+        <source>list.label_id</source>
+        <target>Id</target>
       </trans-unit>
       <trans-unit id="form.group_general">
         <source>form.group_general</source>
@@ -70,8 +70,8 @@
         <source>form.label_variable_pattern</source>
         <target>Motif variable</target>
       </trans-unit>
-      <trans-unit id="form.label_route_content">
-        <source>form.label_route_content</source>
+      <trans-unit id="form.label_content">
+        <source>form.label_content</source>
         <target>Contenu</target>
       </trans-unit>
       <trans-unit id="form.label_defaults">

Resources/translations/CmfRoutingBundle.pl.xliff

@@ -50,10 +50,6 @@
         <source>filter.label_name</source>
         <target>Nazwa</target>
       </trans-unit>
-      <trans-unit id="list.label_path">
-        <source>list.label_path</source>
-        <target>Ścieżka</target>
-      </trans-unit>
       <trans-unit id="list.label_id">
         <source>list.label_id</source>
         <target>Ścieżka</target>
@@ -74,8 +70,8 @@
         <source>form.label_variable_pattern</source>
         <target>Wzór zmiennych</target>
       </trans-unit>
-      <trans-unit id="form.label_route_content">
-        <source>form.label_route_content</source>
+      <trans-unit id="form.label_content">
+        <source>form.label_content</source>
         <target>Zawartość</target>
       </trans-unit>
       <trans-unit id="form.label_defaults">

Tests/Functional/Admin/RouteAdminTest.php

@@ -35,6 +35,11 @@ protected function setUp()
     public function testCorrectControllerPath()
     {
         $route = new Route('/', array('_controller' => 'FrameworkBundle:Redirect:redirect'));
+
+        $this->errorElement->expects($this->never())
+            ->method('with')
+        ;
+
         $this->routeAdmin->validate($this->errorElement, $route);
     }
 
@@ -74,7 +79,13 @@ public function testTemplateViolation()
 
     public function testCorrectTemplate()
     {
-        $route = new Route('/', array('_template' => 'TwigBundle::layout.html.twig'));
+        // the template 'TwigBundle::layout.html.twig' is not found in the test setup...
+        $mockTemplate = $this->getMockBuilder('Twig_Template')->disableOriginalConstructor()->getMockForAbstractClass();
+        $route = new Route('/', array('_template' => $mockTemplate));
+        $this->errorElement->expects($this->never())
+            ->method('with')
+        ;
+
         $this->routeAdmin->validate($this->errorElement, $route);
     }
 }