Permalink
Browse files

Language fixes, added english strings etc

  • Loading branch information...
1 parent 4238989 commit cf38360f584a664d18d83d7b37ebaf69ab273fa8 martin committed Sep 3, 2002
Showing with 83 additions and 42 deletions.
  1. +1 −1 admin/site.php
  2. +1 −1 course/lib.php
  3. +20 −11 course/teacher.php
  4. +1 −1 index.php
  5. +16 −0 lang/en/forum.php
  6. +15 −1 lang/en/moodle.php
  7. +1 −1 login/forgot_password_form.html
  8. +3 −3 login/index.php
  9. +1 −1 mod/forum/lib.php
  10. +24 −22 mod/forum/post.php
View
@@ -65,7 +65,7 @@
"<A HREF=\"$CFG->wwwroot/admin/\">$stradmin</A> -> $strsitesettings", "$focus");
print_simple_box_start("center", "", "$THEME->cellheading");
- print_heading("Editing site settings");
+ print_heading($strsitesettings);
include("site.html");
print_simple_box_end();
print_footer();
View
@@ -197,7 +197,7 @@ function print_all_courses($cat=1, $style="full", $maxcount=999) {
}
} else {
- echo "<H3>No courses have been defined yet</H3>";
+ echo "<H3>".get_string("nocoursesyet")."</H3>";
}
}
View
@@ -18,14 +18,23 @@
$strassignteachers = get_string("assignteachers");
$stradministration = get_string("administration");
+ $strexistingteachers = get_string("existingteachers");
+ $strnoexistingteachers = get_string("noexistingteachers");
+ $strpotentialteachers = get_string("potentialteachers");
+ $strnopotentialteachers = get_string("nopotentialteachers");
+ $straddteacher = get_string("addteacher");
+ $strremoveteacher = get_string("removeteacher");
+ $strsearch = get_string("search");
+ $strsearchagain = get_string("searchagain");
+ $strtoomanytoshow = get_string("toomanytoshow");
if (!$id) {
print_header("$site->fullname: $strassignteachers", "$site->fullname",
"<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strassignteachers");
if ($courses = get_records_sql("SELECT * from course WHERE category > 0 ORDER BY fullname")) {
- print_heading("Choose a course to add teachers to");
+ print_heading(get_string("choosecourse"));
print_simple_box_start("CENTER");
foreach ($courses as $course) {
echo "<A HREF=\"teacher.php?id=$course->id\">$course->fullname</A><BR>";
@@ -111,17 +120,17 @@
/// Print the lists of existing and potential teachers
echo "<TABLE CELLPADDING=2 CELLSPACING=10 ALIGN=CENTER>";
- echo "<TR><TH WIDTH=50%>Existing Teachers</TH><TH WIDTH=50%>Potential Teachers</TH></TR>";
+ echo "<TR><TH WIDTH=50%>$strexistingteachers</TH><TH WIDTH=50%>$strpotentialteachers</TH></TR>";
echo "<TR><TD WIDTH=50% NOWRAP VALIGN=TOP>";
/// First, show existing teachers for this course
if (! $teachers) {
- echo "<P ALIGN=CENTER>No existing teachers</A>";
+ echo "<P ALIGN=CENTER>$strnoexistingteachers</A>";
} else {
foreach ($teachers as $teacher) {
- echo "<P ALIGN=right>$teacher->firstname $teacher->lastname, $teacher->email &nbsp;&nbsp; <A HREF=\"teacher.php?id=$course->id&remove=$teacher->id\" TITLE=\"Remove teacher\"><IMG SRC=\"../pix/t/right.gif\" BORDER=0></A></P>";
+ echo "<P ALIGN=right>$teacher->firstname $teacher->lastname, $teacher->email &nbsp;&nbsp; <A HREF=\"teacher.php?id=$course->id&remove=$teacher->id\" TITLE=\"$strremoveteacher\"><IMG SRC=\"../pix/t/right.gif\" BORDER=0></A></P>";
}
}
@@ -134,10 +143,10 @@
AND (firstname LIKE '%$search%' OR
lastname LIKE '%$search%' OR
email LIKE '%$search%')
- AND username <> 'guest'");
+ AND username <> 'guest' AND username <> 'changeme'");
} else {
$users = get_records_sql("SELECT * from user WHERE confirmed = 1
- AND username <> 'guest'");
+ AND username <> 'guest' AND username <> 'changeme'");
}
@@ -155,30 +164,30 @@
}
if (! $potential) {
- echo "<P ALIGN=CENTER>No potential teachers</A>";
+ echo "<P ALIGN=CENTER>$strnopotentialteachers</A>";
if ($search) {
echo "<FORM ACTION=teacher.php METHOD=GET>";
echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
echo "<INPUT TYPE=text NAME=search SIZE=20>";
- echo "<INPUT TYPE=submit VALUE=\"Search again\">";
+ echo "<INPUT TYPE=submit VALUE=\"$strsearchagain\">";
echo "</FORM>";
}
} else {
if ($search) {
- echo "<P ALIGN=CENTER>(Search results)</P>";
+ echo "<P ALIGN=CENTER>($strsearchresults)</P>";
}
if (count($potential) <= 20) {
foreach ($potential as $user) {
- echo "<P ALIGN=LEFT><A HREF=\"teacher.php?id=$course->id&add=$user->id\" TITLE=\"Add teacher\"><IMG SRC=\"../pix/t/left.gif\" BORDER=0></A>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+ echo "<P ALIGN=LEFT><A HREF=\"teacher.php?id=$course->id&add=$user->id\" TITLE=\"$straddteacher\"><IMG SRC=\"../pix/t/left.gif\" BORDER=0></A>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
}
} else {
echo "<P ALIGN=CENTER>There are too many users to show.<BR>";
echo "Enter a search word here.";
echo "<FORM ACTION=teacher.php METHOD=GET>";
echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
echo "<INPUT TYPE=text NAME=search SIZE=20>";
- echo "<INPUT TYPE=submit VALUE=Search>";
+ echo "<INPUT TYPE=submit VALUE=\"$strsearch\">";
echo "</FORM>";
}
}
View
@@ -52,7 +52,7 @@
if (isediting($site->id)) {
echo "<DIV ALIGN=right>";
popup_form("$CFG->wwwroot/course/mod.php?id=$site->id&section=0&add=",
- $modnames, "section0", "", "Add...");
+ $modnames, "section0", "", get_string("add")."...");
echo "</DIV>";
}
View
@@ -14,13 +14,22 @@
$string[attachment] = "Attachment";
$string[bynameondate] = "by \$a->name - \$a->date";
$string[canstudentsstart] = "Can a \$a start new discussions?";
+$string[couldnotadd] = "Could not add your post due to an unknown error";
+$string[couldnotdeleteratings] = "Sorry, that cannot be deleted as people have already rated it";
+$string[couldnotdeletereplies] = "Sorry, that cannot be deleted as people have already responded to it";
+$string[couldnotupdate] = "Could not update your post due to an unknown error";
$string[delete] = "Delete";
+$string[deleteddiscussion] = "The discussion topic has been deleted";
+$string[deletedpost] = "The post has been deleted";
+$string[deletesure] = "Are you sure you want to delete this post?";
$string[discussion] = "Discussion";
$string[discussions] = "Discussions";
$string[discussionsstartedby] = "Discussions started by \$a";
$string[discussthistopic] = "Discuss this topic";
$string[eachuserforum] = "Each person posts one discussion";
$string[edit] = "Edit";
+$string[editing] = "Editing";
+$string[emptymessage] = "Something was wrong with your post. Perhaps you left it blank, or the attachment was too big. Your changes have NOT been saved.";
$string[everyonecanchoose] = "Everyone can choose to be subscribed";
$string[everyoneissubscribed] = "Everyone is subscribed to this forum";
$string[forcesubscribe] = "Force everyone to be subscribed";
@@ -37,6 +46,7 @@
$string[introsocial] = "An open forum for chatting about anything you want to";
$string[introteacher] = "A forum for teacher-only notes and discussion";
$string[learningforums] = "Learning forums";
+$string[maxtimehaspassed] = "Sorry, but the maximum time for editing this post (\$a) has passed!";
$string[message] = "Message";
$string[modeflatoldestfirst] = "Display replies flat, with oldest first";
$string[modeflatnewestfirst] = "Display replies flat, with newest first";
@@ -47,13 +57,15 @@
$string[namesocial] = "Social forum";
$string[nameteacher] = "Teacher forum";
$string[nodiscussions] = "There are no discussion topics yet in this forum";
+$string[noguestpost] = "Sorry, guests are not allowed to post";
$string[noposts] = "No posts";
$string[nosubscribers] = "There are no subscribers yet for this forum";
$string[nownotsubscribed] = "\$a->name will NOT receive copies of '\$a->forum' by email.";
$string[nowsubscribed] = "\$a->name will receive copies of '\$a->forum' by email.";
$string[numposts] = "\$a posts";
$string[olderdiscussions] = "Older discussions";
$string[parentofthispost] = "Parent of this post";
+$string[postadded] = "Your post was successfully added.<P>You have \$a to edit it if you want to make any changes.";
$string[postmailinfo] = "This is a copy of a message posted on the \$a website.
To add your reply via the website, click on this link:";
@@ -74,10 +86,12 @@
$string[postrating1] = "Shows mostly SEPARATE knowing";
$string[postrating2] = "Equally separate and connected";
$string[postrating3] = "Shows mostly CONNECTED knowing";
+$string[postupdated] = "Your post was updated";
$string[processingpost] = "Processing post \$a";
$string[rate] = "Rate";
$string[ratings] = "Ratings";
$string[readtherest] = "Read the rest of this topic";
+$string[re] = "Re:"; // Put in front of subjects that are replies to another post
$string[repliesmany] = "\$a replies so far";
$string[repliesone] = "\$a reply so far";
$string[reply] = "Reply";
@@ -93,5 +107,7 @@
$string[subscribersto] = "Subscribers to '\$a'";
$string[unsubscribe] = "Unsubscribe from this forum";
$string[youratedthis] = "You rated this";
+$string[yournewtopic] = "Your new discussion topic";
+$string[yourreply] = "Your reply";
?>
View
@@ -11,6 +11,7 @@
$string[addnewcourse] = "Add a new course";
$string[addnewuser] = "Add a new user";
$string[address] = "Address";
+$string[addteacher] = "Add teacher";
$string[admin] = "Admin";
$string[administration] = "Administration";
$string[again] = "again";
@@ -29,6 +30,8 @@
$string[changepassword] = "Change password";
$string[changedpassword] = "Changed password";
$string[changessaved] = "Changes saved";
+$string[checklanguage] = "Check language (\$a)";
+$string[checklanguagediff] = "The following differences were found between the current language and English:";
$string[choose] = "Choose";
$string[choosecourse] = "Choose a course";
$string[chooselivelogs] = "Or watch current activity";
@@ -117,6 +120,7 @@
$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[existingteachers] = "Existing teachers";
$string[error] = "Error";
$string[feedback] = "Feedback";
$string[files] = "Files";
@@ -148,10 +152,12 @@
http://www.gnu.org/copyleft/gpl.html";
$string[grade] = "Grade";
+$string[guestskey] = "Allow guests who have the key";
$string[guestsno] = "Do not allow guests in";
$string[guestsnotallowed] = "Sorry, '\$a' does not allow guests to enter.";
$string[guestsyes] = "Allow guests without the key";
-$string[guestskey] = "Allow guests who have the key";
+$string[guestuser] = "Guest User";
+$string[guestuserinfo] = "This user is a special user that allows read-only access to some courses.";
$string[help] = "Help";
$string[helppicture] = "How to upload a picture";
$string[helptext] = "How to write text";
@@ -268,7 +274,9 @@
$string[newsitemsnumber] = "News items to show";
$string[no] = "No";
$string[nocoursesyet] = "There are no courses yet";
+$string[noexistingteachers] = "No existing teachers";
$string[nograde] = "No grade";
+$string[nopotentialteachers] = "No potential teachers";
$string[nostudentsyet] = "No students enrolled in this course yet";
$string[nosuchemail] = "No such email address";
$string[noteachersyet] = "No teachers in this course yet";
@@ -299,17 +307,22 @@
$string[people] = "People";
$string[personalprofile] = "Personal profile";
$string[phone] = "Phone";
+$string[potentialteachers] = "Potential teachers";
$string[preview] = "Preview";
$string[previeworchoose] = "Preview or choose a theme";
$string[question] = "Question";
$string[readme] = "README"; // This is a file name
$string[recentactivity] = "Recent activity";
+$string[removeteacher] = "Remove teacher";
$string['rename'] = "Rename";
$string[resources] = "Resources";
$string[returningtosite] = "Returning to this web site?";
$string[requireskey] = "This course requires an enrolment key";
$string[revert] = "Revert";
$string[savechanges] = "Save changes";
+$string[search] = "Search";
+$string[searchagain] = "Search again";
+$string[searchresults] = "Search results";
$string[section] = "Section";
$string[selectacountry] = "Select a country";
$string[senddetails] = "Send my details via email";
@@ -348,6 +361,7 @@
$string[themesaved] = "New theme saved";
$string[today] = "Today";
$string[todaylogs] = "Today's logs";
+$string[toomanytoshow] = "There are too many users to show";
$string[topic] = "Topic";
$string[topicoutline] = "Topic outline";
$string[turneditingoff] = "Turn editing off";
@@ -15,7 +15,7 @@
<tr>
<td></td>
<td><input type="submit" value="<? print_string("ok") ?>">
- <input type="button" value="Cancel" onClick="javascript: history.go(-1)">
+ <input type="button" value="<? print_string("cancel") ?>" onClick="javascript: history.go(-1)">
</td>
</table>
</form>
View
@@ -6,10 +6,10 @@
if (! record_exists("user", "username", "guest")) {
$guest->username = "guest";
$guest->password = md5("guest");
- $guest->firstname = "Guest";
- $guest->lastname = "User";
+ $guest->firstname = get_string("guestuser");
+ $guest->lastname = " ";
$guest->email = "root@localhost";
- $guest->description = "This user is a special user that allows read-only access to some courses.";
+ $guest->description = get_string("guestuserinfo");
$guest->confirmed = 1;
$guest->timemodified= time();
View
@@ -127,7 +127,7 @@ function forum_make_mail_post(&$post, $user, $touser, $course,
if ($ownpost) {
$output .= "<A HREF=\"$CFG->wwwroot/mod/forum/post.php?delete=$post->id\">".get_string("delete", "forum")."</A>";
if ($reply) {
- $output .= "| <A HREF=\"$CFG->wwwroot/mod/forum/post.php?reply=$post->id\">".get_string("reply", "forum")."</A>";
+ $output .= " | <A HREF=\"$CFG->wwwroot/mod/forum/post.php?reply=$post->id\">".get_string("reply", "forum")."</A>";
}
$output .= "&nbsp;&nbsp;";
} else {
Oops, something went wrong.

0 comments on commit cf38360

Please sign in to comment.