Index: calendar/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v
retrieving revision 1.206.2.13
diff -u -r1.206.2.13 lib.php
--- calendar/lib.php	30 Apr 2008 04:45:23 -0000	1.206.2.13
+++ calendar/lib.php	17 Mar 2009 23:00:23 -0000
@@ -680,6 +680,30 @@
     }
 
     $events = get_records_select('event', $whereclause, 'timestart');
+    if ($events) {
+        foreach ($events as $event) {
+            if ($event->modulename) {
+                $instance = get_record($event->modulename, 'id', $event->instance);
+                switch ($event->modulename) {
+                    case 'assignment':
+                        $eventname = $instance->name.' ('.get_string('duedate', 'assignment').')';
+                        break;
+                    case 'chat':
+                        $eventname = $instance->name.' ('.get_string('chattime', 'chat').')';
+                        break;
+                    case 'exercise':
+                        $eventname = $instance->name.' ('.get_string('deadline', 'exercise').')';
+                        break;
+                    case 'workshop':
+                        $eventname = get_string($event->eventtype.'event', 'workshop', $instance->name);
+                        break;
+                    default:
+                        $eventname = $instance->name.' ('.get_string($event->modulename.$event->eventtype.'s', $event->modulename).')';
+                }
+                $event->name = $eventname;
+            }
+        }
+    }
     if ($events === false) {
         $events = array();
     }