diff --git a/admin/settings/grades.php b/admin/settings/grades.php index 67b6a14a790..220904aac13 100644 --- a/admin/settings/grades.php +++ b/admin/settings/grades.php @@ -102,7 +102,7 @@ if (has_capability('moodle/grade:manage', $systemcontext) $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'), get_string('aggregateoutcomes_help', 'grades'), $defaults, $options)); $temp->add(new admin_setting_gradecat_combo('grade_aggregatesubcats', get_string('aggregatesubcats', 'grades'), - get_string('aggregatesubcatshelp', 'grades'), $defaults, $options)); + get_string('aggregatesubcats_help', 'grades'), $defaults, $options)); $options = array(0 => get_string('none')); for ($i=1; $i<=20; $i++) { diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php index 4fe36431e9f..a932abeb6be 100644 --- a/grade/edit/tree/category_form.php +++ b/grade/edit/tree/category_form.php @@ -72,7 +72,7 @@ class edit_category_form extends moodleform { } $mform->addElement('advcheckbox', 'aggregatesubcats', get_string('aggregatesubcats', 'grades')); - $mform->setHelpButton('aggregatesubcats', array('aggregatesubcats', get_string('aggregatesubcats', 'grades'), 'grade'), true); + $mform->addHelpButton('aggregatesubcats', 'aggregatesubcats', 'grades'); if ((int)$CFG->grade_aggregatesubcats_flag & 2) { $mform->setAdvanced('aggregatesubcats'); diff --git a/lang/en/grades.php b/lang/en/grades.php index b2d1eea2134..3ba502613fc 100755 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -49,7 +49,6 @@ $string['aggregateoutcomes_help'] = 'If enabled, outcomes are included in the ag $string['aggregatesonly'] = 'Aggregates only'; $string['aggregatesubcats'] = 'Aggregate including subcategories'; $string['aggregatesubcats_help'] = 'This setting determines whether grades in subcategories are included in the aggregation.'; -$string['aggregatesubcatshelp'] = 'The aggregation is usually done only with immediate children, it is also possible to aggregate including individual grades in all subcategories excluding other aggregated grades.'; $string['aggregatesum'] = 'Sum of grades'; $string['aggregateweightedmean'] = 'Weighted mean of grades'; $string['aggregateweightedmean2'] = 'Simple weighted mean of grades'; diff --git a/lang/en/help/grade/aggregatesubcats.html b/lang/en/help/grade/aggregatesubcats.html deleted file mode 100644 index ca82c21a3de..00000000000 --- a/lang/en/help/grade/aggregatesubcats.html +++ /dev/null @@ -1,2 +0,0 @@ -

Aggregate including subcategories

-

The aggregation is usually done only with immediate children, it is also possible to aggregate including individual grades in all subcategories excluding other aggregated grades.