### Eclipse Workspace Patch 1.0
#P scheduler
Index: studentview.controller.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/scheduler/studentview.controller.php,v
retrieving revision 1.3.2.6
diff -u -r1.3.2.6 studentview.controller.php
--- studentview.controller.php	24 Jun 2009 23:01:53 -0000	1.3.2.6
+++ studentview.controller.php	6 Nov 2009 13:52:00 -0000
@@ -106,7 +106,8 @@
                                'COURSE_URL' => $CFG->wwwroot.'/course/view.php?id='.$COURSE->id,
                                'MODULE' => $scheduler->name,
                                'USER' => fullname($student),
-                               'DATE' => userdate($oldappointment->starttime),
+                               'DATE' => userdate($oldappointment->starttime,get_string('strftimedate')),   // BUGFIX CONTRIB-937
+	                           'TIME' => userdate($oldappointment->starttime,get_string('strftimetime')),   // BUGFIX end
                                'DURATION' => $oldappointment->duration );
                 $notification = compile_mail_template('cancelled', $vars );
                 $notificationHtml = compile_mail_template('cancelled_html', $vars );
@@ -146,8 +147,9 @@
                            'COURSE_URL' => $CFG->wwwroot.'/course/view.php?id='.$COURSE->id,
                            'MODULE' => $scheduler->name,
                            'USER' => fullname($student),
-                           'DATE' => userdate($slot->starttime),
-                           'DURATION' => $slot->duration );
+                           'DATE' => userdate($slot->starttime,get_string('strftimedate')),   // BUGFIX CONTRIB-937
+	                       'TIME' => userdate($slot->starttime,get_string('strftimetime')),   // BUGFIX end
+	                       'DURATION' => $slot->duration );
             $notification = compile_mail_template('applied', $vars );
             $notificationHtml = compile_mail_template('applied_html', $vars );
             email_to_user($teacher, $student, get_string('newappointment', 'scheduler', $SITE->shortname), $notification, $notificationHtml);
@@ -174,7 +176,8 @@
                                'COURSE_URL' => $CFG->wwwroot.'/course/view.php?id='.$COURSE->id,
                                'MODULE' => $scheduler->name,
                                'USER' => fullname($student),
-                               'DATE' => userdate($slot->starttime),
+                               'DATE' => userdate($oldslot->starttime,get_string('strftimedate')),  // BUGFIX CONTRIB-937
+	                           'TIME' => userdate($oldslot->starttime,get_string('strftimetime')),  // BUGFIX end
                                'DURATION' => $slot->duration );
                 $notification = compile_mail_template('cancelled', $vars );
                 $notificationHtml = compile_mail_template('cancelled_html', $vars );
Index: teacherview.controller.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/scheduler/teacherview.controller.php,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 teacherview.controller.php
--- teacherview.controller.php	24 Jun 2009 23:01:53 -0000	1.2.2.7
+++ teacherview.controller.php	6 Nov 2009 13:52:00 -0000
@@ -441,7 +441,8 @@
                                    'MODULE' => $scheduler->name,
                                    'USER' => fullname($student),
                                    'STAFFROLE' => format_string($scheduler->staffrolename),
-                                   'DATE' => userdate($slot->starttime),
+                                   'DATE' => userdate($slot->starttime,get_string('strftimedate')),  // BUGFIX CONTRIB-937
+	                               'TIME' => userdate($slot->starttime,get_string('strftimetime')),  // BUGFIX end
                                    'DURATION' => $slot->duration );
                     $notification = compile_mail_template('teachercancelled', $vars );
                     $notificationHtml = compile_mail_template('teachercancelled_html', $vars );
Index: locallib.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/scheduler/locallib.php,v
retrieving revision 1.3.2.7
diff -u -r1.3.2.7 locallib.php
--- locallib.php	13 Jun 2008 22:23:06 -0000	1.3.2.7
+++ locallib.php	6 Nov 2009 13:52:00 -0000
@@ -605,7 +605,8 @@
                            'COURSE_URL' => $CFG->wwwroot.'/course/view.php?id='.$COURSE->id,
                            'MODULE' => $scheduler->name,
                            'USER' => fullname($student),
-                           'DATE' => userdate($slot->starttime),
+                           'DATE' => userdate($slot->starttime,get_string('strftimedate')),   // BUGFIX CONTRIB-937
+	                       'TIME' => userdate($slot->starttime,get_string('strftimetime')),   // BUGFIX end
                            'DURATION' => $slot->duration );
             $notification = compile_mail_template('cancelled', $vars );
             $notificationHtml = compile_mail_template('cancelled_html', $vars );