Merged MDL-6591 Simplified some wording and fixed the help file name for emailnotific...

diff --git a/lang/en_utf8/assignment.php b/lang/en_utf8/assignment.php
index 850934d40a6916bcfa2c3b8f2d6c6d36e6c4e9e1..39a08892476e24858b7b65c3ae5a7dee087a0b65 100644 (file)
--- 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 (file)
index 0000000..350232b
--- /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 (file)
index b0d41ad..0000000
--- 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 f8663c52fe6c513a46dc9f3c033c8d91db9e32f5..1fb5ee1722631480682921f17e982e1a87907551 100644 (file)
--- 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 82534428d903aaa9ac90fa4670aa0f1d48d74529..2389b2ad3f4a296f1a98b04e164db805052502fa 100644 (file)
--- 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>';