From 8aa0c699b73bf2e4cd8767420eaa817f3ad5e83e Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 27 Feb 2008 05:07:57 +0000
Subject: [PATCH] Merged MDL-6591 Simplified some wording and fixed the help
 file name for emailnotification

---
 lang/en_utf8/assignment.php                               | 2 +-
 lang/en_utf8/help/assignment/emailnotification.html       | 6 ++++++
 lang/en_utf8/help/assignment/enableemailnotification.html | 6 ------
 lang/en_utf8/help/assignment/trackdrafts.html             | 4 ++--
 mod/assignment/lib.php                                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 lang/en_utf8/help/assignment/emailnotification.html
 delete mode 100644 lang/en_utf8/help/assignment/enableemailnotification.html

diff --git a/lang/en_utf8/assignment.php b/lang/en_utf8/assignment.php
index 850934d40a6..39a08892476 100644
--- a/lang/en_utf8/assignment.php
+++ b/lang/en_utf8/assignment.php
@@ -50,7 +50,7 @@ for <i>\'$a->assignment\'</i><br /><br />
 It is <a href=\"$a->url\">available on the web site</a>.';
 $string['emailteachers'] = 'Email alerts to teachers';
 $string['emptysubmission'] = 'You have not submitted anything yet';
-$string['enableemailnotification'] = 'Send feedback/grade notification emails';
+$string['enableemailnotification'] = 'Send notification emails';
 $string['existingfiledeleted'] = 'Existing file has been deleted: $a';
 $string['failedupdatefeedback'] = 'Failed to update submission feedback for user $a';
 $string['feedback'] = 'Feedback';
diff --git a/lang/en_utf8/help/assignment/emailnotification.html b/lang/en_utf8/help/assignment/emailnotification.html
new file mode 100644
index 00000000000..350232b699e
--- /dev/null
+++ b/lang/en_utf8/help/assignment/emailnotification.html
@@ -0,0 +1,6 @@
+<h1>Send notification email</h1>
+
+<p>If you turn this on then students will be notified via email about their grades and feedback.</p>
+
+<p>Your personal preference is saved and will apply to all assignment submissions you grade.</p>
+
diff --git a/lang/en_utf8/help/assignment/enableemailnotification.html b/lang/en_utf8/help/assignment/enableemailnotification.html
deleted file mode 100644
index b0d41adefb7..00000000000
--- a/lang/en_utf8/help/assignment/enableemailnotification.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Send feedback/grade notification emails</h1>
-
-<p>Do you want to notify students about received grades and feedback via email?</p>
-
-<p>Your preference is saved and will apply to grading in all assignments in all courses.</p>
-
diff --git a/lang/en_utf8/help/assignment/trackdrafts.html b/lang/en_utf8/help/assignment/trackdrafts.html
index f8663c52fe6..1fb5ee17226 100644
--- a/lang/en_utf8/help/assignment/trackdrafts.html
+++ b/lang/en_utf8/help/assignment/trackdrafts.html
@@ -1,3 +1,3 @@
-<h1>Enable Send for marking</h1>
+<h1>Send for marking</h1>
 
-<p>Send for marking button allows students to indicate that they finished working on assignment. Teacher may also prevent further submission or revert to draft.</p>
+<p>The "Send for marking" button allows users to indicate to graders that they have finished working on an assignment. Graders may choose to revert the assignment to draft status (if it requires further work, for example).</p>
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 82534428d90..2389b2ad3f4 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1318,7 +1318,7 @@ class assignment_base {
             echo '<label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>';
             echo '<input type="hidden" name="mailinfo" value="0" />';
             echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' />';
-            helpbutton('enableemailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'</p></div>';
+            helpbutton('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'</p></div>';
             echo '</div>';
             echo '<div class="fastgbutton"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
             echo '</div>';