L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-65699-37' of http://github.com/dravek/moodle into MOODLE_37_STABLE

Browse Source
This commit is contained in:
Adrian Greeve
2019-05-27 14:53:36 +08:00
parent 3f853115e9 c227fc61f1
commit 523efc4cd0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/classes/external/event_exporter_base.php
Vendored
+3 -1
View File
@@ -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);
calendar/templates/event_details.mustache
+6 -4
View File
@@ -59,10 +59,12 @@
<div class="col-xs-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
<div class="col-xs-11">{{{formattedtime}}}</div>
</div>
<div class="row mt-1">
<div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
<div class="col-xs-11">{{normalisedeventtypetext}}</div>
</div>
{{#normalisedeventtypetext}}
<div class="row mt-1">
<div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
<div class="col-xs-11">{{normalisedeventtypetext}}</div>
</div>
{{/normalisedeventtypetext}}
{{#description}}
<div class="row mt-1">
<div class="col-xs-1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>