Index: moodle/mod/lamslesson/lib.php
===================================================================
diff -u -r7c213fca0b500eef6ff18849dea168572436ee6c -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 7c213fca0b500eef6ff18849dea168572436ee6c)
+++ moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -452,13 +452,11 @@
     
     $form->timemodified = time();
     
-    $locale = lamslesson_get_locale($form->course);
-    
     // start the lesson
     $form->lesson_id = lamslesson_get_lesson(
         $USER->username, $form->sequence_id, $form->course, 
         $form->name, $form->intro, 'start',
-        $locale['country'], $locale['lang'], $form->customCSV, $form->displaydesign
+        $USER->country, $USER->lang, $form->customCSV, $form->displaydesign
     );
 
     if (!isset($form->lesson_id) || $form->lesson_id <= 0) {
@@ -469,7 +467,7 @@
 	
     // call threaded lams servlet to populate the class
     $result = lamslesson_fill_lesson($USER->username, $form->lesson_id,
-				     $form->course, $locale['country'], $locale['lang'], $members
+				     $form->course, $USER->country, $USER->lang, $members
 				     );
     
     // log adding of lesson
@@ -479,36 +477,6 @@
     }
 }
 
-/**
- * Return array with 2 keys 'country' and 'lang', to be sent to LAMS as the
- * basis for a LAMS locale like en_AU.  Makes best effort to choose appropriate
- * locale based on course, user, or server setting.
- */
-function lamslesson_get_locale($courseid) {
-
-  global $CFG, $USER, $DB;
-  $locale = array('country' => '', 'lang' => '');
-	
-  if ($CFG->country != '') {
-    $locale['country'] = trim($CFG->country);
-  }
-	
-  // return course's language and server's country, if either exist
-  if ($course = $DB->get_record('course', array('id' => $courseid))) {
-    if ($course->lang != '') {
-      $locale['lang'] = substr(trim($course->lang), 0, 2);
-      return $locale;
-    }
-  }
-
-    
-  // use user's country and language if course has no language set
-  $locale['country'] = trim($USER->country);
-  $locale['lang'] = substr(trim($USER->lang), 0, 2);
-    
-  return $locale;
-}
-
 /*
  * Returns a list of learners and monitors in the given course or group.
  */