Merge branch 'MDL-58997-group-names-multilang' of https://github.com/lucaboesch/moodle

diff --cc calendar/event_form.php
index 6a1bdf9,ed030da..cfff16f
--- 1/calendar/event_form.php
--- 2/calendar/event_form.php
+++ b/calendar/event_form.php
@@@ -72,7 -72,8 +72,8 @@@ class event_form extends moodleform 
              if (!empty($eventtypes->groups) && is_array($eventtypes->groups)) {
                  $groupoptions = array();
                  foreach ($eventtypes->groups as $group) {
-                     $groupoptions[$group->id] = $group->name;
+                     $groupoptions[$group->id] = format_string($group->name, true,
 -                    array('context' => context_course::instance($group->courseid)));
++                        array('context' => context_course::instance($group->courseid)));
                  }
                  $mform->addElement('select', 'groupid', get_string('typegroup', 'calendar'), $groupoptions);
                  $mform->disabledIf('groupid', 'eventtype', 'noteq', 'group');