Index: moodle/mod/lamslesson/view.php
===================================================================
diff -u -r8b6bca47a049736fbc71ca5f06ca233ad40dd471 -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/view.php	(.../view.php)	(revision 8b6bca47a049736fbc71ca5f06ca233ad40dd471)
+++ moodle/mod/lamslesson/view.php	(.../view.php)	(revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -48,7 +48,6 @@
 require_login($course, true, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-$locale = lamslesson_get_locale($course->id);
 
 add_to_log($course->id, 'lamslesson', 'view', "view.php?id=$cm->id", $lamslesson->name, $cm->id);
 
@@ -95,15 +94,15 @@
 
 echo $OUTPUT->box_start('generalbox', 'intro');
 if ($canparticipate || $canmanage) {
-  $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_STRICT_METHOD);
+  $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_STRICT_METHOD);
   echo '<div class="centerlink">';
   echo '<span id="learnerbutton" class="yui3-button yui3-link-button"><span class="first-child"> ';
   echo $OUTPUT->action_link($learnerurl, get_string('openlesson', 'lamslesson'), new popup_action('click', $learnerurl, '', array('height' => 600, 'width' => 996)));
   echo '</span></span>';
   echo '</div>';
 }
 if ($canmanage) {
-    $monitorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_MONITOR_METHOD);
+    $monitorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_MONITOR_METHOD);
   echo '<div class="centerlink">';
   echo '<span id="monitorbutton" class="yui3-button yui3-link-button"><span class="first-child"> ';
   echo $OUTPUT->action_link($monitorurl, get_string('openmonitor', 'lamslesson'), new popup_action('click', $monitorurl, '', array('height' => 600, 'width' => 996)));
@@ -115,7 +114,7 @@
 
 // Once we have progress info ready
 
-$progress = lamslesson_get_student_progress($USER->username,$lamslesson->lesson_id, $course->id,$USER->firstname,$USER->lastname,$USER->email,$locale['country'],$locale['lang']);
+$progress = lamslesson_get_student_progress($USER->username,$lamslesson->lesson_id, $course->id,$USER->firstname,$USER->lastname,$USER->email,$USER->country,$USER->lang);
 
 // Progress details