From af978a6dc4e8bb2bf8f240b53903175835d5cbf3 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 19 Jul 2002 12:01:35 +0000 Subject: [PATCH] More language changes --- course/edit.html | 59 ++++++++++++++++++++++++--------------------- course/edit.php | 10 +++++--- course/enrol.php | 7 ++++++ lang/en/strings.php | 27 +++++++++++++++++++++ login/confirm.php | 4 +-- login/signup.php | 2 ++ 6 files changed, 75 insertions(+), 34 deletions(-) diff --git a/course/edit.html b/course/edit.html index 9b9b76ceb3..df42847191 100644 --- a/course/edit.html +++ b/course/edit.html @@ -1,39 +1,39 @@
- + - + - + - + - + - + - + - + - + - + - + - + - +

Full name:

:

Short name:

:

Summary:

:

Enrolment Key:

:

Open to guests?:

:

 guest, "") ?>

Category:

:

 categories, "category", "$form->category"); formerr($err["category"]); @@ -41,7 +41,7 @@

Format:

:

 format"); formerr($err["format"]); @@ -49,19 +49,22 @@

News items to show:

:

 "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 @@

Word for teacher:

:

 - (eg Teacher, Tutor, Facilitator etc) + ()

Word for student:

:

 - (eg Student, Participant etc) + ()

Start date:

:

 days, "startday", "$form->startday"); choose_from_menu ($form->months, "startmonth", "$form->startmonth"); @@ -90,7 +93,7 @@ ?>

Number of weeks/topics:

:
">
diff --git a/course/edit.php b/course/edit.php index 0db5511ccb..96ec7a1c97 100644 --- 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", "wwwroot/course/view.php?id=$course->id\">$course->shortname - -> Edit course settings", $focus); + -> $editcoursesettings", $focus); } else { print_header("Admin: Creating a new course", "$site->shortname: Administration", "wwwroot/admin/\">Admin @@ -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 2ac8dc9e79..016270d07b 100644 --- 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 4c0fa35fd0..18d8a27fe9 100644 --- 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 869f2bea82..235887ad56 100644 --- a/login/confirm.php +++ b/login/confirm.php @@ -13,7 +13,7 @@ print_header(get_string("alreadyconfirmed"), get_string("alreadyconfirmed"), "", ""); echo "

".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "

\n"; echo "

".get_string("alreadyconfirmed")."

\n"; - echo "

wwwroot/course/\">".get_string("courses")."

\n"; + echo "

-> wwwroot/course/\">".get_string("courses")."

\n"; print_footer(); exit; } @@ -42,7 +42,7 @@ print_header(get_string("confirmed"), get_string("confirmed"), "", ""); echo "

".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "

\n"; echo "

".get_string("confirmed")."

\n"; - echo "

wwwroot/course/\">".get_string("courses")."

\n"; + echo "

-> wwwroot/course/\">".get_string("courses")."

\n"; print_footer(); } else { diff --git a/login/signup.php b/login/signup.php index 96d1e31278..44990b0b59 100644 --- a/login/signup.php +++ b/login/signup.php @@ -24,7 +24,9 @@ $emailconfirm = get_string("emailconfirm"); print_header($emailconfirm, $emailconfirm, $emailconfirm); + echo "
"; print_string("emailconfirmsent", "", $user->email); + echo "
"; print_footer(); exit; } -- 2.39.5