Merge pull request #95 from fribim/changed-label-enrolled-people

changed label
jsalamander · Aug 28, 2017 · 74f1d73 · 74f1d73
2 parents 778d69c + 8671ef8
commit 74f1d73
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/app/Resources/translations/messages.de.xlf b/app/Resources/translations/messages.de.xlf
@@ -396,9 +396,13 @@
                 <source>edit_person</source>
                 <target>Bearbeite</target>
             </trans-unit>
-            <trans-unit id="people_needed_for_shift">
-                <source>people_needed_for_shift</source>
-                <target>Offene Schichtplätze</target>
+            <trans-unit id="enrolled_people">
+                <source>enrolled_people</source>
+                <target>Eingeschriebene Personen</target>
+            </trans-unit>
+            <trans-unit id="of">
+                <source>of</source>
+                <target>von</target>
             </trans-unit>
         </body>
     </file>

diff --git a/app/Resources/translations/messages.en.xlf b/app/Resources/translations/messages.en.xlf
@@ -392,9 +392,13 @@
                 <source>edit_person</source>
                 <target>Edit</target>
             </trans-unit>
-            <trans-unit id="people_needed_for_shift">
-                <source>people_needed_for_shift</source>
-                <target>People needed</target>
+            <trans-unit id="enrolled_people">
+                <source>enrolled_people</source>
+                <target>Enrolled people</target>
+            </trans-unit>
+            <trans-unit id="of">
+                <source>of</source>
+                <target>of</target>
             </trans-unit>
         </body>
     </file>

diff --git a/app/Resources/views/plancollection/show.html.twig b/app/Resources/views/plancollection/show.html.twig
@@ -9,7 +9,7 @@
                     <tr>
                         <th>{% trans %}plans{% endtrans %}</th>
                         <th>{% trans %}date{% endtrans %}</th>
-                        <th>{% trans %}people_needed_for_shift{% endtrans %}</th>
+                        <th>{% trans %}enrolled_people{% endtrans %}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -23,7 +23,7 @@
                             {% set total = total + shift.numberPeople %}
                             {% set filled = filled + shift.people.count %}
                         {% endfor  %}
-                        <td> {{ filled }} / {{ total }}</td>
+                        <td> {{ filled }} {{ 'of'|trans }} {{ total }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>

diff --git a/tests/AppBundle/Controller/PlanCollection/PlanCollectionControllerTest.php b/tests/AppBundle/Controller/PlanCollection/PlanCollectionControllerTest.php
@@ -107,8 +107,8 @@ public function testShowCollection()
         $this->assertContains('/plan/' . $this->fixtures->getReference('admin-plan')->getId(),
             $this->crawler->filter('tr')->eq(2)->filter('a')->attr('href'));
         $this->assertContains('admin second plan', $this->crawler->filter('tr')->eq(1)->text());
-        $this->assertContains(' 0 / 0', $this->crawler->filter('tbody tr td')->eq(2)->text());
-        $this->assertContains(' 1 / 3', $this->crawler->filter('tbody tr')->eq(1)->filter('tr td')->eq(2)->text());
+        $this->assertContains(' 0 von 0', $this->crawler->filter('tbody tr td')->eq(2)->text());
+        $this->assertContains(' 1 von 3', $this->crawler->filter('tbody tr')->eq(1)->filter('tr td')->eq(2)->text());
     }
 
     public function createACollection()