MDL-13709 More lang fixes. Merging from MOODLE_19_STABLE

diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php
index ebb4b0d83942022159364f6e8780f78c11261cf9..d1ba6475980ac067c758bddf7a4e390007f1a2c2 100644 (file)
--- a/grade/import/xml/grade_import_form.php
+++ b/grade/import/xml/grade_import_form.php
@@ -57,19 +57,16 @@ class grade_import_form extends moodleform {
                 }
             }
             $mform->addElement('select', 'key', get_string('userkey', 'userkey'), $options);
-            $mform->setHelpButton('key', array(false, get_string('userkey', 'userkey'),
-                    false, true, false, get_string("userkeyhelp", 'grades')));
+            $mform->setHelpButton('key', array('userkey', get_string('userkey', 'userkey'), 'grade'));
             $mform->addElement('static', 'keymanagerlink', get_string('keymanager', 'userkey'),
                     '<a href="'.$CFG->wwwroot.'/grade/import/keymanager.php?id='.$COURSE->id.'">'.get_string('keymanager', 'userkey').'</a>');
 
             $mform->addElement('text', 'iprestriction', get_string('keyiprestriction', 'userkey'), array('size'=>80));
-            $mform->setHelpButton('iprestriction', array(false, get_string('keyiprestriction', 'userkey'),
-                    false, true, false, get_string("keyiprestrictionhelp", 'userkey')));
+            $mform->setHelpButton('iprestriction', array('keyiprestriction', get_string('keyiprestriction', 'userkey'), 'userkey'));
             $mform->setDefault('iprestriction', getremoteaddr()); // own IP - just in case somebody does not know what user key is
 
             $mform->addElement('date_time_selector', 'validuntil', get_string('keyvaliduntil', 'userkey'), array('optional'=>true));
-            $mform->setHelpButton('validuntil', array(false, get_string('keyvaliduntil', 'userkey'),
-                    false, true, false, get_string("keyvaliduntilhelp", 'userkey')));
+            $mform->setHelpButton('validuntil', array('keyvaliduntil', get_string('keyvaliduntil', 'userkey'), 'userkey'));
             $mform->setDefault('validuntil', time()+3600*24*7); // only 1 week default duration - just in case somebody does not know what user key is
 
             $mform->disabledIf('iprestriction', 'key', 'noteq', 1);

diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php
index 8fd104cbf2f7e8d7d8a4c870e3cb21b17ac466d6..27a3bebb88f2a2aabc6a20061018b47b151cd358 100644 (file)
--- a/grade/report/overview/lib.php
+++ b/grade/report/overview/lib.php
@@ -202,8 +202,7 @@ function grade_report_overview_settings_definition(&$mform) {
     }
 
     $mform->addElement('select', 'report_overview_showrank', get_string('showrank', 'grades'), $options);
-    $mform->setHelpButton('report_overview_showrank', array(false, get_string('showrank', 'grades'),
-                          false, true, false, get_string('configshowrank', 'grades')));
+    $mform->setHelpButton('report_overview_showrank', array('showrank', get_string('showrank', 'grades'), 'grade')); 
 }
 
 ?>

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index fd686c3d993c6f47c49ee693193a99428cc0c374..7ec335ec647e853e7b260aff92c60b046449118e 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -327,9 +327,7 @@ function grade_report_user_settings_definition(&$mform) {
     }
 
     $mform->addElement('select', 'report_user_showrank', get_string('showrank', 'grades'), $options);
-    $mform->setHelpButton('report_user_showrank', array(false, get_string('showrank', 'grades'),
-                          false, true, false, get_string('configshowrank', 'grades')));
-
+    $mform->setHelpButton('report_user_showrank', array('showrank', get_string('showrank', 'grades'), 'grade')); 
 
     $options = array(-1 => get_string('default', 'grades'),
                       0 => get_string('hide'),
@@ -343,8 +341,7 @@ function grade_report_user_settings_definition(&$mform) {
     }
 
     $mform->addElement('select', 'report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), $options);
-    $mform->setHelpButton('report_user_showhiddenitems', array(false, get_string('showhiddenitems', 'grades'),
-                          false, true, false, get_string('configshowhiddenitems', 'grades')));
+    $mform->setHelpButton('report_user_showhiddenitems', array('showhiddenitems', get_string('showhiddenitems', 'grades'), 'grade')); 
 }
 
 function grade_report_user_profilereport($course, $user) {

diff --git a/lang/en_utf8/help/grade/droplow.html b/lang/en_utf8/help/grade/droplow.html
index 4006ecee5033902a5c5fc39ba88fb595621a6161..136d99915bf311992502f6492e6ba3dbfbe9c0bf 100644 (file)
--- a/lang/en_utf8/help/grade/droplow.html
+++ b/lang/en_utf8/help/grade/droplow.html
@@ -1,2 +1,2 @@
-<h1>Drop low</h1>
+<h1>Drop the lowest</h1>
 <p>If set, this option will drop the X lowest grades, X being the selected value for this option.</p>

diff --git a/lang/en_utf8/help/grade/showquickfeedback.html b/lang/en_utf8/help/grade/showquickfeedback.html
index 96e425557a13accc7c1ccbf527c8a76c0be52c69..c4c7a126fa0b5e85bdd46b2a0bb1823bf7008870 100644 (file)
--- a/lang/en_utf8/help/grade/showquickfeedback.html
+++ b/lang/en_utf8/help/grade/showquickfeedback.html
@@ -1,2 +1,2 @@
 <h1>Show quick feedback</h1>
-<p>Quick Feedback adds a text input element in each grade cell on the grader report, allowing you to edit the feedback for many grades at once. You can then click the Update button to perform all these changes at once, instead of one at a time.</p>
+<p>Quick feedback adds a text input element in each grade cell on the grader report, allowing you to edit the feedback for many grades at once. You can then click the Update button to perform all these changes at once, instead of one at a time.</p>

diff --git a/lang/en_utf8/help/grade/showuseridnumber.html b/lang/en_utf8/help/grade/showuseridnumber.html
index 343ec5f07a765fb33140825eb09aaa6a9feb3caf..7333748b3452b9aeac6b5c31ecda61991f89c202 100644 (file)
--- a/lang/en_utf8/help/grade/showuseridnumber.html
+++ b/lang/en_utf8/help/grade/showuseridnumber.html
@@ -1,2 +1,2 @@
-<h1>Show user Id numbers</h1>
+<h1>Show user id numbers</h1>
 <p>Whether to show user id numbers in an additional column.</p>