Resolve "Benachrichtigungen über ausgefallene Termin: Mailtext ist konfus und hat andere Schwächen"

Closes #5767

Merge request studip/studip!4409

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/dates.inc.php b/lib/dates.inc.php
index 398f8dd..5ebd84d 100644
--- a/lib/dates.inc.php
+++ b/lib/dates.inc.php
@@ -312,12 +312,14 @@ function raumzeit_send_cancel_message($comment, $dates)
                 _('In der Veranstaltung %s fallen die folgenden Termine aus:'),
                 count($dates)
             ),
-            $course->name . ' (' . implode(',', $lecturers) . ') ' . $course->start_semester->name
+            "\n\n" . $course->name . ' (' . implode(', ', $lecturers) . ")\n\n"
         );
-        $message .= "\n\n- ";
-        $message .= implode("\n- " , array_map(fn($a) => (string) $a, $dates));
+        $message .= "\n\n" . implode("\n- " , array_map(
+                fn($a) => strftime('%A, %x %H:%M', $a->date). '-'.  date('H:i', $a->end_time),
+                $dates
+            ));
         if ($comment) {
-            $message .= "\n\n" . $comment;
+            $message .= "\n\n" . _('Hinweis:') . "\n\n" . $comment;
         }
         $msg = new messaging();
         return $msg->insert_message($message, $recipients, '____%system%____', '', '', '', '', $subject, true);