MDL-13699 Followed Helen's instructions. Merging from MOODLE_19_STABLE

diff --git a/grade/edit/tree/grade_form.php b/grade/edit/tree/grade_form.php
index 4c12a7f7f94a159151f70dfcdbbaa3ce95ce36de..c9ef1f7665e2e97cf9f11ac9001272debdc37321 100755 (executable)
--- a/grade/edit/tree/grade_form.php
+++ b/grade/edit/tree/grade_form.php
@@ -91,7 +91,7 @@ class edit_grade_form extends moodleform {
         $mform->addElement('advcheckbox', 'locked', get_string('locked', 'grades'));
         $mform->setHelpButton('locked', array('locked', get_string('locked', 'grades'), 'grade'));
         $mform->addElement('date_time_selector', 'locktime', get_string('locktime', 'grades'), array('optional'=>true));
-        $mform->setHelpButton('locktime', array('locktime', get_string('locktime', 'grades'), 'grade'));
+        $mform->setHelpButton('locktime', array('lockedafter', get_string('locktime', 'grades'), 'grade'));
         $mform->disabledIf('locktime', 'gradetype', 'eq', GRADE_TYPE_NONE);
 
         // Feedback format is automatically converted to html if user has enabled editor

diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php
index 5ae74647a2da7f364aeff4e78758b29562c527c8..e1ed7d9b1ab833822541a9028d36ebe24fde5e35 100644 (file)
--- a/grade/edit/tree/item_form.php
+++ b/grade/edit/tree/item_form.php
@@ -141,7 +141,7 @@ class edit_item_form extends moodleform {
         $mform->setHelpButton('locked', array('locked', get_string('locked', 'grades'), 'grade'));
 
         $mform->addElement('date_time_selector', 'locktime', get_string('locktime', 'grades'), array('optional'=>true));
-        $mform->setHelpButton('locktime', array('locktime', get_string('locktime', 'grades'), 'grade'));
+        $mform->setHelpButton('locktime', array('lockedafter', get_string('locktime', 'grades'), 'grade'));
         $mform->disabledIf('locktime', 'gradetype', 'eq', GRADE_TYPE_NONE);
 
 /// parent category related settings

diff --git a/grade/edit/tree/outcomeitem_form.php b/grade/edit/tree/outcomeitem_form.php
index 2afb1888c995044910b801d2bc52e5dd3f5653d4..f74a9850c814f437bc234767b110819449110574 100644 (file)
--- a/grade/edit/tree/outcomeitem_form.php
+++ b/grade/edit/tree/outcomeitem_form.php
@@ -85,7 +85,7 @@ class edit_outcomeitem_form extends moodleform {
         $mform->addElement('advcheckbox', 'locked', get_string('locked', 'grades'));
         $mform->setHelpButton('locked', array('locked', get_string('locked', 'grades'), 'grade'));
         $mform->addElement('date_time_selector', 'locktime', get_string('locktime', 'grades'), array('optional'=>true));
-        $mform->setHelpButton('locktime', array('locktime', get_string('locktime', 'grades'), 'grade'));
+        $mform->setHelpButton('locktime', array('lockedafter', get_string('locktime', 'grades'), 'grade'));
 
 /// parent category related settings
         $mform->addElement('header', 'headerparent', get_string('parentcategory', 'grades'));

diff --git a/lang/en_utf8/help/grade/lockeduntil.html b/lang/en_utf8/help/grade/lockedafter.html
similarity index 97%
rename from lang/en_utf8/help/grade/lockeduntil.html
rename to lang/en_utf8/help/grade/lockedafter.html
index 52f359a9aade199b3954f43138fe1a49b34c5fe0..c76e9d28455dbea04bcfeb72db7d0de959bdf546 100644 (file)
--- a/lang/en_utf8/help/grade/lockeduntil.html
+++ b/lang/en_utf8/help/grade/lockedafter.html
@@ -1,4 +1,4 @@
-<h1>Locked until</h1>
+<h1>Locked after</h1>
 <p>Date <strong>after</strong> which the grades will be <strong>locked</strong>. Usually this date is set to the end of the activity, and the beginning of the grading process.. A typical sequence of events would be:
 </p>
 <table class="generaltable boxaligncenter" cellpadding="4" cellspacing="1" summary="Principal events in the grading process, and matching locked and hidden states">