Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle

This commit is contained in:
Dan Poltawski
2014-10-15 16:56:43 +01:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -464,7 +464,7 @@ function grade_get_graded_users_select($report, $course, $userid, $groupid, $inc
* @param int $courseid The current course id.
*/
function hide_natural_aggregation_upgrade_notice($courseid) {
set_config('show_sumofgrades_upgrade_' . $courseid, false);
unset_config('show_sumofgrades_upgrade_' . $courseid);
}
/**
+2 -2
View File
@@ -671,8 +671,8 @@ $string['studentsperpagereduced'] = 'Reduced maximum students per page from {$a-
$string['subcategory'] = 'Normal category';
$string['submissions'] = 'Submissions';
$string['submittedon'] = 'Submitted: {$a}';
$string['sumofgradesupgradedgrades'] = 'A recent upgrade has changed the aggregation method "Sum of grades" to "Natural". Please review the grades in this course as it was previously using "Sum of grades".';
$string['sumofgradesupgradedgradeshidemessage'] = 'Got it';
$string['sumofgradesupgradedgrades'] = 'Note: The aggregation method "Sum of grades" has been changed to "Natural" as part of a site upgrade. Since "Sum of grades" was previously used in this course, it is recommended that you review this change in the gradebook.';
$string['sumofgradesupgradedgradeshidemessage'] = 'OK';
$string['switchtofullview'] = 'Switch to full view';
$string['switchtosimpleview'] = 'Switch to simple view';
$string['tabs'] = 'Tabs';