changed output format of SeminarCycleDate::toString, CourseDate::getFullName and CourseExDate::getFullName and made the output of CourseDateList::toHtml a list with invisible list items, fixes #4889

Closes #4889

Merge request studip/studip!3662

3 files changed, 29 insertions, 10 deletions

diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
index f33332e..82dd692 100644
--- a/lib/models/CourseDate.php
+++ b/lib/models/CourseDate.php
@@ -331,7 +331,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
             $string = sprintf(
                 '%1$s, %2$s - %3$s',
                 $day_of_week,
-                date('d.m.Y H:i', $this->date),
+                date('d.m.y, H:i', $this->date),
                 $formatted_end
             );
         }
diff --git a/lib/models/CourseExDate.php b/lib/models/CourseExDate.php
index eb0f90a..ec6e312 100644
--- a/lib/models/CourseExDate.php
+++ b/lib/models/CourseExDate.php
@@ -135,17 +135,36 @@ class CourseExDate extends SimpleORMap implements PrivacyObject, Event
             return '';
         }
 
-        $latter_template = $format === 'verbose'
-                         ? _('%R Uhr')
-                         : '%R';
-
         if (($this->end_time - $this->date) / 60 / 60 > 23) {
-            return strftime('%a., %x' . ' (' . _('ganztägig') . ')' , $this->date) . " (" . _("fällt aus") . ")";
+            $date_string = studip_interpolate(
+                $format === 'verbose'
+                    ? _('%{weekday}, %{date}, %{start} - %{end} Uhr (ganztägig, fällt aus)')
+                    : _('%{weekday}, %{date}, %{start} - %{end} (ganztägig, fällt aus)')
+                ,
+                [
+                    'weekday' => getWeekday(date('N', $this->date)),
+                    'date'    => date('d.m.y', $this->date),
+                    'start'   => date('H:i', $this->date),
+                    'end'     => date('H:i', $this->end_time),
+                ]
+            );
+            return $date_string;
         }
 
-        return strftime('%a., %x, %R', $this->date) . ' - '
-             . strftime($latter_template, $this->end_time)
-             . ' (' . _('fällt aus') . ')';
+        $date_string = studip_interpolate(
+            $format === 'verbose'
+                ? _('%{weekday}, %{date}, %{start} - %{end} Uhr (fällt aus)')
+                : _('%{weekday}, %{date}, %{start} - %{end} (fällt aus)')
+            ,
+            [
+                'weekday' => getWeekday(date('N', $this->date)),
+                'date'    => date('d.m.y', $this->date),
+                'start'   => date('H:i', $this->date),
+                'end'     => date('H:i', $this->end_time),
+            ]
+        );
+
+        return $date_string;
     }
 
     /**
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php
index 9a922e9..74b0c78 100644
--- a/lib/models/SeminarCycleDate.php
+++ b/lib/models/SeminarCycleDate.php
@@ -253,7 +253,7 @@ class SeminarCycleDate extends SimpleORMap
                 }
                 $first_date = $this->getFirstDate();
                 if ($first_date) {
-                    $parameters['start_date'] = date('d.m.Y', $first_date->date);
+                    $parameters['start_date'] = date('d.m.y', $first_date->date);
                 }
                 if ($room && $first_date) {
                     $text = _('%{weekday}, %{beginning} - %{end}, %{interval} (ab dem %{start_date} im Raum %{room_name})');