More language changes

diff --git a/course/edit.html b/course/edit.html
index 9b9b76ceb3326fc9ed72a9f52f76f530f53118c0..df42847191a9b91eddc1b8c8e3dde1f73dff970a 100644 (file)
--- a/course/edit.html
+++ b/course/edit.html
@@ -1,39 +1,39 @@
 <FORM METHOD="post" action="edit.php" NAME="form">
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
-       <td><P>Full name:</td>
+       <td><P><? print_string("fullname") ?>:</td>
        <td><input type="text" name="fullname" size=50 value="<? p($form->fullname) ?>">
        <? formerr($err["fullname"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Short name:</td>
+       <td><P><? print_string("shortname") ?>:</td>
        <td><input type="text" name="shortname" size=10 value="<? p($form->shortname) ?>">
        <? formerr($err["shortname"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Summary:</td>
+       <td><P><? print_string("summary") ?>:</td>
        <td><TEXTAREA NAME=summary COLS=50 ROWS=10 WRAP=virtual><? p($form->summary) ?></TEXTAREA>
        <? formerr($err["summary"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Enrolment Key:</td>
+       <td><P><? print_string("enrolmentkey") ?>:</td>
        <td><input type="text" name="password" size=25 value="<? p($form->password) ?>">
        <? formerr($err["password"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Open to guests?:</td>
+       <td><P><? print_string("opentoguests") ?>:</td>
        <td><?
-    $choices["0"] = "No, only students are allowed";
-    $choices["1"] = "Yes, allow \"guest\" student in";
+    $choices["0"] = get_string("guestsno");
+    $choices["1"] = get_string("guestsyes");
     choose_from_menu ($choices, "guest", $form->guest, "") ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Category:</td>
+       <td><P><? print_string("category") ?>:</td>
        <td><? 
            choose_from_menu ($form->categories, "category", "$form->category");
               formerr($err["category"]);
@@ -41,7 +41,7 @@
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Format:</td>
+       <td><P><? print_string("format") ?>:</td>
        <td><? 
            choose_from_menu ($FORMATS, "format", "$form->format");
               formerr($err["format"]);
@@ -49,19 +49,22 @@
        </td>
 </tr>
 <tr valign=top>
-    <td><P>News items to show:</td>
+    <td><P><? print_string("newsitemsnumber") ?>:</td>
     <td><? 
-       $options = array("0" => "0 news items",
-                        "1" => "1 news item",
-                        "2" => "2 news items",
-                        "3" => "3 news items",
-                        "4" => "4 news items",
-                        "5" => "5 news items",
-                        "6" => "6 news items",
-                        "7" => "7 news items",
-                        "8" => "8 news items",
-                        "9" => "9 news items",
-                        "10" => "10 news items");
+       $newsitem = get_string("newsitem");
+       $newsitems = get_string("newsitems");
+
+       $options = array("0" => "0 $newsitems",
+                        "1" => "1 $newsitem",
+                        "2" => "2 $newsitems",
+                        "3" => "3 $newsitems",
+                        "4" => "4 $newsitems",
+                        "5" => "5 $newsitems",
+                        "6" => "6 $newsitems",
+                        "7" => "7 $newsitems",
+                        "8" => "8 $newsitems",
+                        "9" => "9 $newsitems",
+                        "10" => "10 $newsitems");
        choose_from_menu ($options, "newsitems", "$form->newsitems");
        formerr($err["newsitems"]);
     ?>
@@ -69,19 +72,19 @@
 </tr>
 
 <tr valign=top>
-       <td><P>Word for teacher:</td>
+       <td><P><? print_string("wordforteacher") ?>:</td>
        <td><input type="text" name="teacher" size=25 value="<? p($form->teacher) ?>">
-       (eg Teacher, Tutor, Facilitator etc) <? formerr($err["teacher"]) ?>
+       (<? print_string("wordforteachereg") ?>) <? formerr($err["teacher"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Word for student:</td>
+       <td><P><? print_string("wordforstudent") ?>:</td>
        <td><input type="text" name="student" size=25 value="<? p($form->student) ?>">
-       (eg Student, Participant etc) <? formerr($err["student"]) ?>
+       (<? print_string("wordforstudenteg") ?>) <? formerr($err["student"]) ?>
        </td>
 </tr>
 <tr valign=top>
-       <td><P>Start date:</td>
+       <td><P><? print_string("startdate") ?>:</td>
        <td><?
            choose_from_menu ($form->days, "startday", "$form->startday");
            choose_from_menu ($form->months, "startmonth", "$form->startmonth");
@@ -90,7 +93,7 @@
        ?></td>
 </tr>
 <tr valign=top>
-       <td><P>Number of weeks/topics:</td>
+       <td><P><? print_string("numberweeks") ?>:</td>
        <td><?
            for ($i=1; $i<=20; $i++) {
               $sectionmenu[$i] = "$i";
@@ -101,7 +104,7 @@
 </tr>
 <tr>
        <td></td>
-       <td><input type="submit" value="Update this course"></td>
+       <td><input type="submit" value="<? print_string("updatethiscourse") ?>"></td>
 </TABLE>
 <INPUT type="hidden" name="id" value="<?=$course->id ?>">
 </FORM>

diff --git a/course/edit.php b/course/edit.php
index 0db5511ccbeb9c8b7eb061c69e2e0679ef85126c..96ec7a1c97372c04e9f328feefe6879442962959 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -60,7 +60,7 @@
                     $section->id = insert_record("course_sections", $section);
 
                     add_to_log($newid, "course", "new", "view.php?id=$newid", "");
-                           redirect("$CFG->wwwroot/admin/teacher.php?id=$newid", "Changes saved");
+                           redirect("$CFG->wwwroot/admin/teacher.php?id=$newid", get_string("changessaved"));
                 } else {
                     error("Serious Error! Could not create the new course!");
                 }
@@ -116,10 +116,12 @@
 
     //$form->owners   = get_records_sql_menu("SELECT u.id, CONCAT(u.firstname, " ", u.lastname) FROM users u, teachers t WHERE t.user = u.id");
 
+    $editcoursesettings = get_string("editcoursesettings");
+
     if (isset($course)) {
-           print_header("Edit course settings", "$course->fullname", 
+           print_header($editcoursesettings, "$course->fullname", 
                      "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
-                      -> Edit course settings", $focus);
+                      -> $editcoursesettings", $focus);
     } else {
         print_header("Admin: Creating a new course", "$site->shortname: Administration",
                      "<A HREF=\"$CFG->wwwroot/admin/\">Admin</A> 
@@ -127,7 +129,7 @@
     }
 
     print_simple_box_start("center", "", "$THEME->cellheading");
-    print_heading("Editing course settings");
+    print_heading($editcoursesettings);
        include("edit.html");
     print_simple_box_end();
 

diff --git a/course/enrol.php b/course/enrol.php
index 2ac8dc9e7929db1bee9136e3751b73a6cb42e377..016270d07b1b0ad43db17cce0e799c015351c637 100644 (file)
--- a/course/enrol.php
+++ b/course/enrol.php
@@ -22,6 +22,13 @@
                 if (! enrol_student_in_course($USER->id, $course->id)) {
                     error("An error occurred while trying to enrol you.");
                 }
+
+                $subject = get_string("welcometocourse", "", $course->fullname);
+                $message = get_string("welcometocoursetext", "", $course->fullname,
+                                      "$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id");
+
+                email_to_user($USER,  get_teacher($course->id), $subject, $message);
+
                 add_to_log($course->id, "course", "enrol", "view.php?id=$course->id", "$USER->id");
             }
 

diff --git a/lang/en/strings.php b/lang/en/strings.php
index 4c0fa35fd0e719e50ea54b8409ccd59934d0e0cc..18d8a27fe9edcb06f3c2a4d7e3be6fad036a0afa 100644 (file)
--- a/lang/en/strings.php
+++ b/lang/en/strings.php
@@ -10,8 +10,10 @@ $string[allfieldsrequired] = "All fields are required";
 $string[alphanumerical] = "Can only contain alphabetical letters or numbers";
 $string[alreadyconfirmed] = "Registration has already been confirmed";
 $string[availablecourses] = "Available Courses";
+$string[category] = "Category";
 $string[changepassword] = "Change password";
 $string[changedpassword] = "Changed password";
+$string[changessaved] = "Changes saved";
 $string[city] = "City/town";
 $string[confirmed] = "Your registration has been confirmed";
 $string[contributions] = "Contributions";
@@ -50,13 +52,18 @@ Cheers from the '\$a->sitename' administrator,
 
 $string[emailexists] = "This email address is already registered.";
 $string[emailmustbereal] = "Note: your email address must be a real one";
+$string[enrolmentkey] = "Enrolment key";
 $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.";
 $string[firstname] = "First name";
 $string[firsttime] = "Is this your first time here?";
 $string[forgotten] = "Forgotten your username or password?";
+$string[format] = "Format";
 $string[fullprofile] = "Full profile";
+$string[fullname] = "Full name";
+$string[guestsno] = "No, do not allow guests in";
+$string[guestsyes] = "Yes, allow 'guest' student in";
 $string[home] = "Home";
 $string[htmlformat] = "Pretty HTML format";
 $string[icqnumber] = "ICQ number";
@@ -127,9 +134,14 @@ Cheers from the '\$a->sitename' administrator,
 \$a->signoff\n";
 
 $string[newpicture] = "New picture";
+$string[newsitem] = "news item";
+$string[newsitems] = "news items";
+$string[newsitemsnumber] = "News items to show";
 $string[nosuchemail] = "No such email address";
 $string[notenrolled] = "\$a is not enrolled in this course.";
+$string[numberweeks] = "Number of weeks/topics";
 $string[ok] = "OK";
+$string[opentoguests] = "Open to guests?";
 $string[optional] = "optional";
 $string[participants] = "Participants";
 $string[password] = "Password";
@@ -147,11 +159,14 @@ $string[returningtosite] = "Returning to this web site?";
 $string[selectacountry] = "Select a country";
 $string[senddetails] = "Send my details via email";
 $string[serverlocaltime] = "Server's local time";
+$string[shortname] = "Short name";
 $string[sitelogs] = "Site logs";
 $string[sitenews] = "Site news";
 $string[sitesettings] = "Site settings";
 $string[someallowguest] = "Some courses may allow guest access";
+$string[startdate] = "Course start date";
 $string[startsignup] = "Start now by creating a new account!";
+$string[summary] = "Summary";
 $string[supplyinfo] = "Please supply some information about yourself";
 $string[teacheronly] = "for the \$a only";
 $string[textformat] = "Plain text format";
@@ -162,11 +177,23 @@ $string[unenrol] = "Unenrol";
 $string[unenrolme] = "Unenrol me from \$a";
 $string[update] = "Update";
 $string[updatemyprofile] = "Update my profile";
+$string[updatethiscourse] = "Update this course";
 $string[userdescription] = "Description";
 $string[username] = "Username";
 $string[usernameexists] = "This username already exists, choose another";
 $string[userprofilefor] = "User profile for \$a";
 $string[webpage] = "Web page";
+$string[welcometocourse] = "Welcome to \$a";
+$string[welcometocoursetext] = "Welcome to \$a!
+
+One of the first things you should do is edit your profile page
+within the course so that we can learn more about you:
+
+  \$b";
+$string[wordforteacher] = "Your word for Teacher";
+$string[wordforteachereg] = "eg Teacher, Tutor, Facilitator etc";
+$string[wordforstudent] = "Your word for Student";
+$string[wordforstudenteg] = "eg Student, Participant etc";
 $string[wrongpassword] = "Incorrect password for this username";
 
 ?>

diff --git a/login/confirm.php b/login/confirm.php
index 869f2bea82e0b94093b19d7dfd62c2fa15b104d3..235887ad56157cfa29c7979494e49cebc38cdebe 100644 (file)
--- a/login/confirm.php
+++ b/login/confirm.php
@@ -13,7 +13,7 @@
                                    print_header(get_string("alreadyconfirmed"), get_string("alreadyconfirmed"), "", "");
                                    echo "<CENTER><H3>".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "</H3>\n";
                            echo "<H4>".get_string("alreadyconfirmed")."</H4>\n";
-                           echo "<H3><A HREF=\"$CFG->wwwroot/course/\">".get_string("courses")."</A></H3>\n";
+                           echo "<H3> -> <A HREF=\"$CFG->wwwroot/course/\">".get_string("courses")."</A></H3>\n";
                                    print_footer();
                     exit;
                 }
@@ -42,7 +42,7 @@
                                print_header(get_string("confirmed"), get_string("confirmed"), "", "");
                                echo "<CENTER><H3>".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "</H3>\n";
                        echo "<H4>".get_string("confirmed")."</H4>\n";
-                       echo "<H3><A HREF=\"$CFG->wwwroot/course/\">".get_string("courses")."</A></H3>\n";
+                       echo "<H3> -> <A HREF=\"$CFG->wwwroot/course/\">".get_string("courses")."</A></H3>\n";
                                print_footer();
 
                        } else {

diff --git a/login/signup.php b/login/signup.php
index 96d1e31278d5bfd909f71fa92d084b061fff846f..44990b0b59d04d9c38c8fbbc6dec09d7324c5a71 100644 (file)
--- a/login/signup.php
+++ b/login/signup.php
@@ -24,7 +24,9 @@
        
             $emailconfirm = get_string("emailconfirm");
                print_header($emailconfirm, $emailconfirm, $emailconfirm);
+            echo "<CENTER>";
             print_string("emailconfirmsent", "", $user->email);
+            echo "</CENTER>";
             print_footer();
                        exit;
                }