FIxes related to strange default languages

diff --git a/admin/settings/language.php b/admin/settings/language.php
index da1b9151000151abd614c016edfedff83951b30c..88f5baa218cced24eb7a7c6022c504561aad4497 100644 (file)
--- a/admin/settings/language.php
+++ b/admin/settings/language.php
@@ -4,7 +4,7 @@
 
 // "languageandlocation" settingpage
 $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
-$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), $CFG->lang, get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
+$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
 $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
 $temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
 $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e1cfc3905d612e77e1062d7cf79f7acba8c9c668..d6f708ea100bc9dbe36e61d434786e3b116e1198 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4066,17 +4066,23 @@ function current_language() {
     global $CFG, $USER, $SESSION;
 
     if (!empty($CFG->courselang)) {    // Course language can override all other settings for this page
-        return $CFG->courselang;
+        $return = $CFG->courselang;
 
     } else if (!empty($SESSION->lang)) {    // Session language can override other settings
-        return $SESSION->lang;
+        $return = $SESSION->lang;
 
     } else if (!empty($USER->lang)) {    // User language can override site language
-        return $USER->lang;
+        $return = $USER->lang;
 
     } else {
-        return $CFG->lang;
+        $return = $CFG->lang;
     }
+
+    if ($return == 'en') {
+        $return = 'en_utf8';
+    }
+
+    return $return;
 }
 
 /* Return the code of the current charset
@@ -6709,4 +6715,4 @@ function loadeditor($args) {
 
 
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
-?>
\ No newline at end of file
+?>