Mail-outs for assignment and journal module are now translatable.

diff --git a/lang/en/assignment.php b/lang/en/assignment.php
index 6b1fdde29d80d7fdfc793ac1cc8ec94579173beb..c9db86fc8be785b5c4dca5f6bf816c799c9f9b86 100644 (file)
--- a/lang/en/assignment.php
+++ b/lang/en/assignment.php
@@ -4,6 +4,15 @@
 
 $string['allowresubmit'] = "Allow resubmitting";
 $string['assignmentdetails'] = "Assignment details";
+$string['assignmentmail'] = "\$a->teacher has posted some feedback on your
+assignment submission for '\$a->assignment'
+
+You can see it appended to your assignment submission:
+
+    \$a->url";
+$string['assignmentmailhtml'] = "\$a->teacher has posted some feedback on your
+assignment submission for '<i>\$a->assignment</i>'<br /><br />
+You can see it appended to your <a href=\\\"\$a->url\\\">assignment submission</a>.";
 $string['assignmentname'] = "Assignment name";
 $string['assignmenttype'] = "Assignment type";
 $string['description'] = "Description";

diff --git a/lang/en/journal.php b/lang/en/journal.php
index ad75192a4bf3934ef4e963f629ff3b67925d9419..f0257cce6950155cfaa3a49e60896c78ae907970 100644 (file)
--- a/lang/en/journal.php
+++ b/lang/en/journal.php
@@ -13,6 +13,15 @@ $string['editingends'] = "Editing period ends";
 $string['editingended'] = "Editing period has ended";
 $string['entries'] = "Entries";
 $string['feedbackupdated'] = "Feedback updated for \$a entries";
+$string['journalmail'] = "\$a->teacher has posted some feedback on your
+journal entry for '\$a->journal'
+
+You can see it appended to your journal entry:
+
+    \$a->url";
+$string['journalmailhtml'] = "\$a->teacher has posted some feedback on your
+journal entry for '<i>\$a->journal</i>'<br /><br />
+You can see it appended to your <a href=\\\"\$a->url\\\">journal entry</a>.";
 $string['journalname'] = "Journal name";
 $string['journalquestion'] = "Journal question";
 $string['journalrating1'] = "Not satisfactory";

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 672d83a4c2aee0918a7daacd52bd7fad9bd0ee85..97c945497aaecf76b3f2fc2854fc53d89765049f 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -149,26 +149,27 @@ function assignment_cron () {
             $strassignments = get_string("modulenameplural", "assignment");
             $strassignment  = get_string("modulename", "assignment");
 
+            unset($assignmentinfo);
+            $assignmentinfo->teacher = "$teacher->firstname $teacher->lastname";
+            $assignmentinfo->assignment = "$submission->name";
+            $assignmentinfo->url = "$CFG->wwwroot/mod/assignment/view.php?id=$mod->id";
+
             $postsubject = "$course->shortname: $strassignments: $submission->name";
             $posttext  = "$course->shortname -> $strassignments -> $submission->name\n";
             $posttext .= "---------------------------------------------------------------------\n";
-            $posttext .= "$teacher->firstname $teacher->lastname has posted some feedback on your\n";
-            $posttext .= "assignment submission for '$submission->name'\n\n";
-            $posttext .= "You can see it appended to your assignment submission:\n";
-            $posttext .= "   $CFG->wwwroot/mod/assignment/view.php?id=$mod->id\n";
+            $posttext .= get_string("assignmentmail", "assignment", $assignmentinfo);
             $posttext .= "---------------------------------------------------------------------\n";
+
             if ($user->mailformat == 1) {  // HTML
-                $posthtml = "<P><FONT FACE=sans-serif>".
-              "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
-              "<A HREF=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</A> ->".
-              "<A HREF=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">$submission->name</A></FONT></P>";
-              $posthtml .= "<HR><FONT FACE=sans-serif>";
-              $posthtml .= "<P>$teacher->firstname $teacher->lastname has posted some feedback on your";
-              $posthtml .= " assignment submission for '<B>$submission->name</B>'</P>";
-              $posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">";
-              $posthtml .= "appended to your assignment submission</A>.</P></FONT><HR>";
+                $posthtml = "<p><font face=\"sans-serif\">".
+                "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
+                "<a href=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</a> ->".
+                "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">$submission->name</a></font></p>";
+                $posthtml .= "<hr><font face=\"sans-serif\">";
+                $posthtml .= "<p>".get_string("assignmentmailhtml", "assignment", $assignmentinfo)."</p>";
+                $posthtml .= "</font><hr>";
             } else {
-              $posthtml = "";
+                $posthtml = "";
             }
 
             if (! email_to_user($user, $teacher, $postsubject, $posttext, $posthtml)) {

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 0826c3b70677543f6c3eedab8cf4c91b6416a975..a003c7f2a02fb927bd6dda3d9b642be92921bfea 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -85,24 +85,24 @@ function journal_cron () {
                 continue;
             }
 
+            unset($journalinfo);
+            $journalinfo->teacher = "$teacher->firstname $teacher->lastname";
+            $journalinfo->journal = "$entry->name";
+            $journalinfo->url = "$CFG->wwwroot/mod/journal/view.php?id=$mod->id";
+
             $postsubject = "$course->shortname: Journal feedback: $entry->name";
             $posttext  = "$course->shortname -> Journals -> $entry->name\n";
             $posttext .= "---------------------------------------------------------------------\n";
-            $posttext .= "$teacher->firstname $teacher->lastname has posted some feedback on your\n";
-            $posttext .= "journal entry for '$entry->name'\n\n";
-            $posttext .= "You can see it appended to your journal entry:\n";
-            $posttext .= "   $CFG->wwwroot/mod/journal/view.php?id=$mod->id\n";
+            $posttext .= get_string("journalmail", "journal", $journalinfo);
             $posttext .= "---------------------------------------------------------------------\n";
             if ($user->mailformat == 1) {  // HTML
-                $posthtml = "<P><FONT FACE=sans-serif>".
-              "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
-              "<A HREF=\"$CFG->wwwroot/mod/journal/index.php?id=$course->id\">Journals</A> ->".
-              "<A HREF=\"$CFG->wwwroot/mod/journal/view.php?id=$mod->id\">$entry->name</A></FONT></P>";
-              $posthtml .= "<HR><FONT FACE=sans-serif>";
-              $posthtml .= "<P>$teacher->firstname $teacher->lastname has posted some feedback on your";
-              $posthtml .= " journal entry for '<B>$entry->name</B>'</P>";
-              $posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/journal/view.php?id=$mod->id\">";
-              $posthtml .= "appended to your journal entry</A>.</P></FONT><HR>";
+                $posthtml = "<p><font face=\"sans-serif\">".
+                "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
+                "<a href=\"$CFG->wwwroot/mod/journal/index.php?id=$course->id\">journals</a> ->".
+                "<a href=\"$CFG->wwwroot/mod/journal/view.php?id=$mod->id\">$entry->name</a></font></p>";
+                $posthtml .= "<hr><font face=\"sans-serif\">";
+                $posthtml .= "<p>".get_string("journalmailhtml", "journal", $journalinfo)."</p>";
+                $posthtml .= "</font><hr>";
             } else {
               $posthtml = "";
             }