diff --git a/src/Controller/Booking/CreateController.php b/src/Controller/Booking/CreateController.php index 351c150..7b00138 100644 --- a/src/Controller/Booking/CreateController.php +++ b/src/Controller/Booking/CreateController.php @@ -143,7 +143,7 @@ final class CreateController extends AbstractController private function flashSeriesResult(SeriesResult $result, Resource $resource): void { if ($result->isCompletelyBlocked()) { - $this->addFlash('warning', \sprintf('%s ist an keinem Tag der Serie frei.', $resource->getLabel())); + $this->addFlash('warning', \sprintf('%s ist an keinem der Tage frei.', $resource->getLabel())); return; } diff --git a/src/Controller/Series/EndController.php b/src/Controller/Series/EndController.php index b1a3608..21e131a 100644 --- a/src/Controller/Series/EndController.php +++ b/src/Controller/Series/EndController.php @@ -59,8 +59,8 @@ final class EndController extends AbstractController $removed = $this->manager->endSeries($series, new \DateTimeImmutable('today')); $this->addFlash('success', $onBehalf - ? \sprintf('Serie von %s beendet, %d Termine entfernt.', $series->getUser()->getName(), $removed) - : \sprintf('Serie beendet, %d Termine entfernt.', $removed)); + ? \sprintf('Wiederholung von %s beendet, %d Termine entfernt.', $series->getUser()->getName(), $removed) + : \sprintf('Wiederholung beendet, %d Termine entfernt.', $removed)); // A series is only ever ended from a list, so this always navigates. return $this->htmxRedirect($request, $this->generateUrl($this->returnRoute($request) ?? 'app_booking')); diff --git a/src/Form/BookingRequest.php b/src/Form/BookingRequest.php index 5f559f4..93d5d35 100644 --- a/src/Form/BookingRequest.php +++ b/src/Form/BookingRequest.php @@ -99,19 +99,19 @@ final class BookingRequest } if (null === $this->until) { - $context->buildViolation('Bitte ein Enddatum für die Serie angeben.')->atPath('until')->addViolation(); + $context->buildViolation('Bitte angeben, bis wann wiederholt wird.')->atPath('until')->addViolation(); return; } if (null !== $this->date && $this->until < $this->date) { - $context->buildViolation('Das Serienende muss nach dem Beginn liegen.')->atPath('until')->addViolation(); + $context->buildViolation('Das Ende muss nach dem Beginn liegen.')->atPath('until')->addViolation(); return; } if (!$this->unlimitedHorizon && $this->until > BookingHorizon::latest()) { - $context->buildViolation(\sprintf('Eine Serie darf höchstens %d Monate in die Zukunft laufen.', BookingHorizon::MONTHS)) + $context->buildViolation(\sprintf('Eine Wiederholung darf höchstens %d Monate in die Zukunft laufen.', BookingHorizon::MONTHS)) ->atPath('until') ->addViolation(); } diff --git a/src/Form/BookingType.php b/src/Form/BookingType.php index ebe8027..ac98287 100644 --- a/src/Form/BookingType.php +++ b/src/Form/BookingType.php @@ -57,7 +57,7 @@ final class BookingType extends AbstractType 'choice_label' => static fn (RecurrenceRule $rule): string => $rule->label(), ]) ->add('until', DateType::class, [ - 'label' => 'Serie bis', + 'label' => 'Wiederholen bis', 'widget' => 'single_text', 'input' => 'datetime_immutable', 'required' => false, diff --git a/templates/admin/_modal_spot.html.twig b/templates/admin/_modal_spot.html.twig index 305ca71..6e7c0cd 100644 --- a/templates/admin/_modal_spot.html.twig +++ b/templates/admin/_modal_spot.html.twig @@ -27,7 +27,7 @@
{{ booking.timeRange }} {% if booking.partOfSeries %} - Serie + wiederkehrend {% endif %}
diff --git a/templates/admin/bookings.html.twig b/templates/admin/bookings.html.twig index 27c2da2..65c0fe3 100644 --- a/templates/admin/bookings.html.twig +++ b/templates/admin/bookings.html.twig @@ -31,7 +31,7 @@ {{ form_end(form) }} {% if series is not empty %} -

Serien

+

Wiederkehrende Buchungen