Merge pull request #708 from it-at-m/cleanup-zms-3377-change-labels

clean(ZMS-3377): changed labels
it-at-m · Nov 26, 2024 · bd65587 · bd65587
2 parents 56de6ac + 7f61960
commit bd65587
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/zmsadmin/custom_templates/block/appointment/form.twig b/zmsadmin/custom_templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>
@@ -248,7 +248,7 @@
                         {% endif %}
                         {{ formgroup(
                             {
-                                "label": "Anmerkung",
+                                "label": "Anmerkung (nur intern sichtbar)",
                                 "checked": scope.preferences.client.amendmentActivated,
                                 "class": "form-group--nomaxwidth",
                                 "errors": formData.amendment.messages
@@ -268,7 +268,7 @@
                         {% if scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
                             {{ formgroup(
                                 {
-                                    "label": scope.preferences.client.customTextfieldLabel,
+                                    "label": "Zusätzliche Bemerkungen (für Bürger sichtbar)",
                                     "required": selectedProcess.preferences.client.customTextfieldRequired|default(scope.preferences.client.customTextfieldRequired),
                                     "errors": formData.customTextfield.messages,
                                     "checked": scope.preferences.client.customTextfieldActivated,

diff --git a/zmsadmin/templates/block/appointment/form.twig b/zmsadmin/templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>

diff --git a/zmsadmin/templates/block/queue/info.twig b/zmsadmin/templates/block/queue/info.twig
@@ -102,7 +102,7 @@
 
                     <li>
                         <div class="cell middle">
-                        <h4>{% trans %}Wartezeit für neue Spontankunden in Stunden{% endtrans %}:</h4>
+                        <h4>{% trans %}Wartezeit für neue Spontankunden in Minuten{% endtrans %}:</h4>
                         </div>
                         <div class="cell right">
                             {% if workstationInfo.workstationGhostCount == 0 %}

diff --git a/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php b/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
@@ -57,7 +57,7 @@ public function testRendering()
             ]
         );
         $response = parent::testRendering();
-        $this->assertStringContainsString('Terminvereinbarung Neu', (string)$response->getBody());
+        $this->assertStringContainsString('Termin erstellen', (string)$response->getBody());
         $this->assertStringContainsString('title="Spontankunde"', (string)$response->getBody());
         $this->assertStringContainsString('Liste leeren', (string)$response->getBody());
     }
@@ -240,7 +240,7 @@ public function testSelectedProcess()
             ]
         );
         $response = $this->render([], ['selectedprocess' => 100044]);
-        $this->assertStringContainsString('Terminvereinbarung Aktualisieren', (string)$response->getBody());
+        $this->assertStringContainsString('Termin aktualisieren', (string)$response->getBody());
     }
 
     public function testSelectedDate()
@@ -290,7 +290,7 @@ public function testSelectedDate()
             ]
         );
         $response = $this->render([], ['selecteddate' => '2016-05-27']);
-        $this->assertStringContainsString('Terminvereinbarung Neu', (string)$response->getBody());
+        $this->assertStringContainsString('Termin erstellen', (string)$response->getBody());
         $this->assertStringContainsString('2016-05-27', (string)$response->getBody());
         $this->assertStringNotContainsString('slotCount', (string)$response->getBody());
     }

diff --git a/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php b/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php
@@ -109,7 +109,7 @@ public function testTodayWithAdditionalInfo()
             'selecteddate' => '2016-04-01'
         ], []);
         $this->assertStringContainsString('davon vor nächstem Spontankunden', (string)$response->getBody());
-        $this->assertStringContainsString('Wartezeit für neue Spontankunden in Stunden', (string)$response->getBody());
+        $this->assertStringContainsString('Wartezeit für neue Spontankunden in Minuten', (string)$response->getBody());
 
         $this->assertEquals(200, $response->getStatusCode());
     }