diff --git a/calendar/classes/external/event_exporter_base.php b/calendar/classes/external/event_exporter_base.php index 08d14acf101..f761f705bcd 100644 --- a/calendar/classes/external/event_exporter_base.php +++ b/calendar/classes/external/event_exporter_base.php @@ -275,7 +275,9 @@ class event_exporter_base extends exporter { } $timesort = $event->get_times()->get_sort_time()->getTimestamp(); $iconexporter = new event_icon_exporter($event, ['context' => $context]); - $values['normalisedeventtypetext'] = get_string('type' . $values['normalisedeventtype'], 'calendar'); + $identifier = 'type' . $values['normalisedeventtype']; + $stringexists = get_string_manager()->string_exists($identifier, 'calendar'); + $values['normalisedeventtypetext'] = $stringexists ? get_string($identifier, 'calendar') : ''; $values['icon'] = $iconexporter->export($output); diff --git a/calendar/templates/event_details.mustache b/calendar/templates/event_details.mustache index 86fcda4cc9b..1a1516fef7d 100644 --- a/calendar/templates/event_details.mustache +++ b/calendar/templates/event_details.mustache @@ -59,10 +59,12 @@
{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}
{{{formattedtime}}}
-
-
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
-
{{normalisedeventtypetext}}
-
+{{#normalisedeventtypetext}} +
+
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
+
{{normalisedeventtypetext}}
+
+{{/normalisedeventtypetext}} {{#description}}
{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}