MDL-6591 changing label to Disable notification in order to prevent confusion; merged...

diff --git a/lang/en_utf8/assignment.php b/lang/en_utf8/assignment.php
index d24529d9df3fff01d22004e74cb929058e1e40bb..d32dd13522492e59b8f07654e665b124b7a5ceca 100644 (file)
--- a/lang/en_utf8/assignment.php
+++ b/lang/en_utf8/assignment.php
@@ -31,13 +31,13 @@ $string['confirmdeletefile'] = 'Are you absolutely sure you want to delete this
 $string['deleteallsubmissions'] = 'Delete all submissions';
 $string['deletefilefailed'] = 'Deleting of file failed.';
 $string['description'] = 'Description';
+$string['disableemailnotification'] = 'Disable notification emails';
 $string['draft'] = 'Draft';
 $string['duedate'] = 'Due date';
 $string['duedateno'] = 'No due date';
 $string['early'] = '$a early';
 $string['editmysubmission'] = 'Edit my submission';
 $string['emailstudents'] = 'Email alerts to students';
-$string['emailnotification'] = 'Send notification email';
 $string['emailteachermail'] = '$a->username has updated their assignment submission
 for \'$a->assignment\'
 

diff --git a/lang/en_utf8/help/assignment/disableemailnotification.html b/lang/en_utf8/help/assignment/disableemailnotification.html
new file mode 100644 (file)
index 0000000..9fcad77
--- /dev/null
+++ b/lang/en_utf8/help/assignment/disableemailnotification.html
@@ -0,0 +1,6 @@
+<h1>Disable notification emails</h1>
+
+<p>Do you want to nofify 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/emailnotification.html b/lang/en_utf8/help/assignment/emailnotification.html
deleted file mode 100644 (file)
index 1b913fa..0000000
--- a/lang/en_utf8/help/assignment/emailnotification.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Send notification email</h1>
-
-<p>Do you want to nofify students about received grades and feedback via email?</p>
-
-<p>Your preference is saved and will apply to all assignments in all courses.</p>
-

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index e8716fceb65f4a65f27c40b62a2d2ae6c7b50da6..9b94a356be73f3a302437de732a04bc5e8a17a7e 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -934,11 +934,11 @@ class assignment_base {
             }
         }
 
-        $lastmailinfo = get_user_preferences('assignment_mailinfo', 1) ? 'checked="checked"' : '';
+        $lastmailinfo = get_user_preferences('assignment_mailinfo', 1) ? '' : 'checked="checked"';
 
         ///Print Buttons in Single View
-        echo '<input type="hidden" name="mailinfo" value="0" />';
-        echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' /><label for="mailinfo">'.get_string('emailnotification','assignment').'</label>';
+        echo '<input type="hidden" name="mailinfo" value="1" />';
+        echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="0" '.$lastmailinfo.' /><label for="mailinfo">'.get_string('disableemailnotification','assignment').'</label>';
         echo '<div class="buttons">';
         echo '<input type="submit" name="submit" value="'.get_string('savechanges').'" onclick = "document.getElementById(\'submitform\').menuindex.value = document.getElementById(\'submitform\').grade.selectedIndex" />';
         echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />';
@@ -1343,10 +1343,11 @@ class assignment_base {
         helpbutton('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'</p></div>';
         echo '</td></tr>';
         echo '<tr><td>';
-        $lastmailinfoqg = get_user_preferences('assignment_mailinfoqg', 1) ? 'checked="checked"' : '';
-        echo '<label for="mailinfoqg">'.get_string('emailnotification','assignment').'</label></td><td>';
-        echo '<input type="checkbox" id="mailinfoqg" name="mailinfoqg" value="1" '.$lastmailinfoqg.' />';
-        helpbutton('emailnotification', get_string('emailnotification', 'assignment'), 'assignment').'</p></div>';
+        $lastmailinfoqg = get_user_preferences('assignment_mailinfoqg', 1) ? '' : 'checked="checked"';
+        echo '<label for="mailinfoqg">'.get_string('disableemailnotification','assignment').'</label></td><td>';
+        echo '<input type="hidden" name="mailinfoqg" value="1" />';
+        echo '<input type="checkbox" id="mailinfoqg" name="mailinfoqg" value="0" '.$lastmailinfoqg.' />';
+        helpbutton('disableemailnotification', get_string('disableemailnotification', 'assignment'), 'assignment').'</p></div>';
         echo '</td></tr>';
         echo '<tr><td colspan="2">';
         echo '<input type="submit" value="'.get_string('savepreferences').'" />';