From: martin <martin>
Date: Sun, 11 Aug 2002 05:11:50 +0000 (+0000)
Subject: Various small changes (mostly to language strings)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4b1371a74ce69f998b4c8384fae591a931bd7676;p=moodle.git

Various small changes (mostly to language strings)
---

diff --git a/CHANGES b/CHANGES
index 68c5f08b1c..40a33f9884 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,69 @@
+2002-08-10 Saturday 23:16  martin
+
+	* user/view.php: Fixes to visibility of unenrol button
+
+2002-08-10 Saturday 23:10  martin
+
+	* user/lib.php: Tweak to display on "unenrol"
+
+2002-08-10 Saturday 22:56  martin
+
+	* mod/assignment/lib.php: Small fix to the full list of available
+	assignments
+
+2002-08-10 Saturday 22:28  martin
+
+	* lang/en/moodle.php: Additions
+
+2002-08-10 Saturday 22:27  martin
+
+	* course/: lib.php, topics.php, weeks.php: More tweaks to recent
+	activity box
+
+2002-08-10 Saturday 21:50  martin
+
+	* course/lib.php: Tweak teacher colour
+
+2002-08-10 Saturday 21:42  martin
+
+	* course/lib.php, course/log.php, course/topics.php,
+	course/weeks.php, lang/en/moodle.php, lib/moodlelib.php: Tweaks and
+	tidy-ups for course home pages (weekly and topics)
+
+2002-08-09 Friday 17:25  martin
+
+	* lib/moodlelib.php, user/lib.php, user/view.php: Further little
+	fixes to user image displaying
+
+2002-08-09 Friday 17:09  martin
+
+	* admin/user.php, lib/moodlelib.php, user/pix.php: Changes to make
+	uploaded user pictures work properly on Windows  :-(
+
+2002-08-09 Friday 17:08  martin
+
+	* doc/install.html: Clearer docs for Windows users
+
+2002-08-09 Friday 14:25  martin
+
+	* doc/install.html: Brought the install procedure up to date
+
+2002-08-09 Friday 10:48  martin
+
+	* index.php: Slight tweak to remove login button for ordinary users
+
+2002-08-09 Friday 10:45  martin
+
+	* index.php, admin/index.php, lib/moodlelib.php,
+	mod/forum/version.php: New functions get_list_of_modules() and
+	moodle_needs_upgrading().  Used on the home page when admin is
+	logged in, to check for any upgrading of the databases that might
+	need to be done.
+
+2002-08-09 Friday 01:43  martin
+
+	* CHANGES: Changes
+
 2002-08-09 Friday 01:34  martin
 
 	* CHANGES: 
diff --git a/course/enrol.php b/course/enrol.php
index 68c8870ca2..1c74a3131d 100644
--- a/course/enrol.php
+++ b/course/enrol.php
@@ -48,8 +48,7 @@
     	    redirect($destination);
     
         } else {
-            $errormsg = "That enrolment key was incorrect, please try again".
-                        "<BR>(Here's a hint - it starts with \"".substr($course->password,0,1)."\")";
+            $errormsg = get_string("enrolmentkeyhint", "", substr($course->password,0,1));
         }
     }
 
diff --git a/course/lib.php b/course/lib.php
index 7f6bef218d..60b945a583 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -263,7 +263,7 @@ function print_recent_activity($course) {
 
     if (! $USER->lastlogin ) {
         echo "<P ALIGN=CENTER><FONT SIZE=1>";
-        print_string("welcometocourse");
+        print_string("welcometocourse", "", $course->shortname);
         echo "</FONT></P>";
         return;
     } else {
diff --git a/course/loginas.php b/course/loginas.php
index be38c15cca..2cc330a8c2 100644
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -27,15 +27,22 @@
 
     $USER = get_user_info_from_db("id", $user);
     $USER->loggedin = true;
+    $USER->realuser = $teacher_id;
+    save_session("USER");
+
     set_moodle_cookie($USER->username);
     $student_name = "$USER->firstname $USER->lastname";
 
     add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&user=$user", "$teacher_name -> $student_name");
 
-    $USER->realuser = $teacher_id;
 
-    notice("You are now logged in as $student_name", "$CFG->wwwroot/course/view.php?id=$course->id");
+    $strloginas    = get_string("loginas");
+    $strloggedinas = get_string("loggedinas", "", $student_name);
+
+    print_header("$course->fullname: $strloginas $student_name", "$course->fullname", 
+                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> 
+                  $strloginas $student_name");
+    notice($strloggedinas, "$CFG->wwwroot/course/view.php?id=$course->id");
 
-    save_session("USER");
 
 ?>
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index f386cefca7..f2760e6388 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -84,6 +84,8 @@ $string[emailmustbereal] = "Note: your email address must be a real one";
 $string[enrolmentkey] = "Enrolment key";
 $string[enrolmentkeyfrom] = "This course requires an 'enrolment key' - a one-time<BR>
 password that you should have got from \$a";
+$string[enrolmentkeyhint] = "That enrolment key was incorrect, please try again<BR>
+(Here's a hint - it starts with '\$a'";
 $string[entercourse] = "Click to enter this course";
 $string[enteremailaddress] = "Enter in your email address to reset your 
    password and have the new password sent to you via email.";