diff --git a/completion/criteria/completion_criteria_grade.php b/completion/criteria/completion_criteria_grade.php
index 99ad7500e28..40707e5dc64 100644
--- a/completion/criteria/completion_criteria_grade.php
+++ b/completion/criteria/completion_criteria_grade.php
@@ -156,7 +156,7 @@ class completion_criteria_grade extends completion_criteria {
* @return string
*/
public function get_type_title() {
- return get_string('grade');
+ return get_string('gradenoun');
}
/**
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index d39b8921c0c..878aa276319 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -995,7 +995,7 @@ abstract class moodleform_mod extends moodleform {
if ($this->_features->hasgrades) {
if ($this->_features->gradecat) {
- $mform->addElement('header', 'modstandardgrade', get_string('grade'));
+ $mform->addElement('header', 'modstandardgrade', get_string('gradenoun'));
}
//if supports grades and grades arent being handled via ratings
@@ -1012,7 +1012,7 @@ abstract class moodleform_mod extends moodleform {
$gradeoptions['hasgrades'] = $gradeitem->has_grades();
}
}
- $mform->addElement('modgrade', $gradefieldname, get_string('grade'), $gradeoptions);
+ $mform->addElement('modgrade', $gradefieldname, get_string('gradenoun'), $gradeoptions);
$mform->addHelpButton($gradefieldname, 'modgrade', 'grades');
$mform->setDefault($gradefieldname, $CFG->gradepointdefault);
diff --git a/grade/grading/tests/behat/behat_grading.php b/grade/grading/tests/behat/behat_grading.php
index d43220ec46e..1847d07c1fc 100644
--- a/grade/grading/tests/behat/behat_grading.php
+++ b/grade/grading/tests/behat/behat_grading.php
@@ -83,7 +83,7 @@ class behat_grading extends behat_base {
public function i_go_to_activity_advanced_grading_page($userfullname, $activityname) {
// Step to access the user grade page from the grading page.
- $gradetext = get_string('grade');
+ $gradetext = get_string('gradeverb');
$this->execute('behat_general::click_link', $this->escape($activityname));
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index c411a84a986..97095a04b14 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -658,7 +658,6 @@ class grade_report_grader extends grade_report {
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->context);
$strfeedback = $this->get_lang_string("feedback");
- $strgrade = $this->get_lang_string('grade');
// TODO Does not support custom user profile fields (MDL-70456).
$extrafields = \core_user\fields::get_identity_fields($this->context, false);
@@ -813,7 +812,7 @@ class grade_report_grader extends grade_report {
$numusers = count($this->users);
$gradetabindex = 1;
$columnstounset = array();
- $strgrade = $this->get_lang_string('grade');
+ $strgrade = $this->get_lang_string('gradenoun');
$strfeedback = $this->get_lang_string("feedback");
$arrows = $this->get_sort_arrows();
diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php
index e763776f4fb..b50c0c674a2 100644
--- a/grade/report/overview/lib.php
+++ b/grade/report/overview/lib.php
@@ -144,12 +144,12 @@ class grade_report_overview extends grade_report {
if ($this->showrank['any']) {
$tablecolumns = array('coursename', 'grade', 'rank');
$tableheaders = array($this->get_lang_string('coursename', 'grades'),
- $this->get_lang_string('grade'),
+ $this->get_lang_string('gradenoun'),
$this->get_lang_string('rank', 'grades'));
} else {
$tablecolumns = array('coursename', 'grade');
$tableheaders = array($this->get_lang_string('coursename', 'grades'),
- $this->get_lang_string('grade'));
+ $this->get_lang_string('gradenoun'));
}
$this->table = new flexible_table('grade-report-overview-'.$this->user->id);
diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 98593b8497f..18f72be1ab9 100644
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -1290,7 +1290,7 @@ function gradereport_user_myprofile_navigation(core_user\output\myprofile\tree $
}
if ($gradeaccess) {
$url = new moodle_url('/course/user.php', array('mode' => 'grade', 'id' => $course->id, 'user' => $user->id));
- $node = new core_user\output\myprofile\node('reports', 'grade', get_string('grade'), null, $url);
+ $node = new core_user\output\myprofile\node('reports', 'grade', get_string('grades'), null, $url);
$tree->add_node($node);
}
}
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 96968e97656..6f246e99204 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -134,3 +134,4 @@ usernameoridoccurenceerror,core_webservice
addbackpack,core_badges
error:backpacknotavailable,core_badges
error:backpackproblem,core_badges
+grade,core
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 1090198974a..1fe3903db03 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -945,8 +945,9 @@ This program is free software: you can redistribute it and/or modify it under th
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the Moodle License information page for full details: https://docs.moodle.org/dev/License';
-$string['grade'] = 'Grade';
$string['grades'] = 'Grades';
+$string['gradenoun'] = 'Grade';
+$string['gradeverb'] = 'Grade';
$string['gravatarenabled'] = 'Gravatar has been enabled for this site. If you don\'t upload a profile picture Moodle will attempt to load a profile picture for you from Gravatar.';
$string['group'] = 'Group';
$string['groupadd'] = 'Add new group';
@@ -2322,3 +2323,4 @@ $string['userfilterplaceholder'] = 'Search keyword or select filter';
// Deprecated since Moodle 3.11.
$string['hidepicture'] = 'Hide picture';
+$string['grade'] = 'Grade';
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index fc32227da44..961a4608a31 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -1500,7 +1500,7 @@ class grade_item extends grade_object {
}
} else {
- return get_string('grade');
+ return get_string('gradenoun');
}
}
diff --git a/mod/assign/feedback/offline/importgradeslib.php b/mod/assign/feedback/offline/importgradeslib.php
index 7f741f1182d..83a6ad9cbac 100644
--- a/mod/assign/feedback/offline/importgradeslib.php
+++ b/mod/assign/feedback/offline/importgradeslib.php
@@ -101,7 +101,7 @@ class assignfeedback_offline_grade_importer {
$columns = $this->csvreader->get_columns();
- $strgrade = get_string('grade');
+ $strgrade = get_string('gradenoun');
$strid = get_string('recordid', 'assign');
$strmodified = get_string('lastmodifiedgrade', 'assign');
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index aee75cd3779..b4072f61b50 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -449,7 +449,7 @@ class assign_grading_table extends table_sql implements renderable {
}
// Grade.
$columns[] = 'grade';
- $headers[] = get_string('grade');
+ $headers[] = get_string('gradenoun');
if ($this->is_downloading()) {
$gradetype = $this->assignment->get_instance()->grade;
if ($gradetype > 0) {
@@ -998,7 +998,7 @@ class assign_grading_table extends table_sql implements renderable {
}
$url = new moodle_url('/mod/assign/view.php', $urlparams);
- $link = '' . get_string('grade') . '';
+ $link = '' . get_string('gradeverb') . '';
$grade .= $link . $separator;
}
@@ -1241,7 +1241,7 @@ class assign_grading_table extends table_sql implements renderable {
$noimage = null;
if (!$row->grade) {
- $description = get_string('grade');
+ $description = get_string('gradeverb');
} else {
$description = get_string('updategrade', 'assign');
}
diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index f5a088e0925..450aac46040 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -880,7 +880,7 @@ function assign_print_recent_mod_activity($activity, $courseid, $detail, $modnam
if (isset($activity->grade)) {
echo '';
- echo get_string('grade').': ';
+ echo get_string('gradenoun') . ': ';
echo $activity->grade;
echo '
';
}
@@ -1286,7 +1286,7 @@ function assign_user_outline($course, $user, $coursemodule, $assignment) {
if (!$gradingitem->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
$result->info = get_string('outlinegrade', 'assign', $gradebookgrade->str_long_grade);
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
$result->time = $gradebookgrade->dategraded;
@@ -1549,7 +1549,7 @@ function mod_assign_core_calendar_provide_event_action(calendar_event $event,
$assign->update_effective_access($userid);
if ($event->eventtype == ASSIGN_EVENT_TYPE_GRADINGDUE) {
- $name = get_string('grade');
+ $name = get_string('gradeverb');
$url = new \moodle_url('/mod/assign/view.php', [
'id' => $cm->id,
'action' => 'grader'
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 709949b412c..c86f7b5b0a3 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4076,7 +4076,7 @@ class assign {
// and show errors.
$mform->is_validated();
}
- $o .= $this->get_renderer()->heading(get_string('grade'), 3);
+ $o .= $this->get_renderer()->heading(get_string('gradenoun'), 3);
$o .= $this->get_renderer()->render(new assign_form('gradingform', $mform));
if (count($allsubmissions) > 1) {
@@ -4262,7 +4262,7 @@ class assign {
'',
array('class'=>'gradeform'));
}
- $o .= $this->get_renderer()->heading(get_string('grade'), 3);
+ $o .= $this->get_renderer()->heading(get_string('gradenoun'), 3);
$o .= $this->get_renderer()->render(new assign_form('gradingform', $mform));
if (count($allsubmissions) > 1 && $attemptnumber == -1) {
@@ -7185,7 +7185,7 @@ class assign {
$info = get_string('gradestudent', 'assign', array('id'=>$user->id, 'fullname'=>fullname($user)));
if ($grade->grade != '') {
- $info .= get_string('grade') . ': ' . $this->display_grade($grade->grade, false) . '. ';
+ $info .= get_string('gradenoun') . ': ' . $this->display_grade($grade->grade, false) . '. ';
} else {
$info .= get_string('nograde', 'assign');
}
@@ -7647,11 +7647,11 @@ class assign {
$gradingdisabled = $this->grading_disabled($userid);
$gradinginstance = $this->get_grading_instance($userid, $grade, $gradingdisabled);
- $mform->addElement('header', 'gradeheader', get_string('grade'));
+ $mform->addElement('header', 'gradeheader', get_string('gradenoun'));
if ($gradinginstance) {
$gradingelement = $mform->addElement('grading',
'advancedgrading',
- get_string('grade').':',
+ get_string('gradenoun') . ':',
array('gradinginstance' => $gradinginstance));
if ($gradingdisabled) {
$gradingelement->freeze();
@@ -7675,7 +7675,7 @@ class assign {
} else {
$grademenu = array(-1 => get_string("nograde")) + make_grades_menu($this->get_instance()->grade);
if (count($grademenu) > 1) {
- $gradingelement = $mform->addElement('select', 'grade', get_string('grade') . ':', $grademenu);
+ $gradingelement = $mform->addElement('select', 'grade', get_string('gradenoun') . ':', $grademenu);
// The grade is already formatted with format_float so it needs to be converted back to an integer.
if (!empty($data->grade)) {
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index e5d4e8aa913..1af000027a5 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -398,7 +398,7 @@ class mod_assign_renderer extends plugin_renderer_base {
if ($summary->cangrade) {
$urlparams = array('id' => $summary->coursemoduleid, 'action' => 'grader');
$url = new moodle_url('/mod/assign/view.php', $urlparams);
- $o .= html_writer::link($url, get_string('grade'),
+ $o .= html_writer::link($url, get_string('gradeverb'),
['class' => 'btn btn-primary ml-1']);
}
$o .= $this->output->container_end();
@@ -426,7 +426,7 @@ class mod_assign_renderer extends plugin_renderer_base {
// Grade.
if (isset($status->gradefordisplay)) {
- $cell1content = get_string('grade');
+ $cell1content = get_string('gradenoun');
$cell2content = $status->gradefordisplay;
$this->add_table_row_tuple($t, $cell1content, $cell2content);
@@ -1097,7 +1097,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$t->data[] = new html_table_row(array($cell));
// Grade.
- $cell1content = get_string('grade');
+ $cell1content = get_string('gradenoun');
$cell2content = $grade->gradefordisplay;
$this->add_table_row_tuple($t, $cell1content, $cell2content);
@@ -1356,7 +1356,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$strsectionname = $indexsummary->courseformatname;
$strduedate = get_string('duedate', 'assign');
$strsubmission = get_string('submission', 'assign');
- $strgrade = get_string('grade');
+ $strgrade = get_string('gradenoun');
$table = new html_table();
if ($indexsummary->usesections) {
diff --git a/mod/assign/tests/lib_test.php b/mod/assign/tests/lib_test.php
index 4bd1946b167..62e9ecf3c4b 100644
--- a/mod/assign/tests/lib_test.php
+++ b/mod/assign/tests/lib_test.php
@@ -536,7 +536,7 @@ class mod_assign_lib_testcase extends advanced_testcase {
// Confirm the event was decorated.
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
- $this->assertEquals(get_string('grade'), $actionevent->get_name());
+ $this->assertEquals(get_string('gradenoun'), $actionevent->get_name());
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
$this->assertEquals(0, $actionevent->get_item_count());
$this->assertTrue($actionevent->is_actionable());
@@ -561,7 +561,7 @@ class mod_assign_lib_testcase extends advanced_testcase {
// Confirm the event was decorated.
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
- $this->assertEquals(get_string('grade'), $actionevent->get_name());
+ $this->assertEquals(get_string('gradenoun'), $actionevent->get_name());
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
$this->assertEquals(0, $actionevent->get_item_count());
$this->assertTrue($actionevent->is_actionable());
@@ -583,7 +583,7 @@ class mod_assign_lib_testcase extends advanced_testcase {
// Confirm the event was decorated.
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
- $this->assertEquals(get_string('grade'), $actionevent->get_name());
+ $this->assertEquals(get_string('gradenoun'), $actionevent->get_name());
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
$this->assertEquals(0, $actionevent->get_item_count());
$this->assertFalse($actionevent->is_actionable());
@@ -608,7 +608,7 @@ class mod_assign_lib_testcase extends advanced_testcase {
// Confirm the event was decorated.
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
- $this->assertEquals(get_string('grade'), $actionevent->get_name());
+ $this->assertEquals(get_string('gradenoun'), $actionevent->get_name());
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
$this->assertEquals(0, $actionevent->get_item_count());
$this->assertFalse($actionevent->is_actionable());
diff --git a/mod/data/lib.php b/mod/data/lib.php
index f0ce0372baa..da4deef40de 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1195,9 +1195,9 @@ function data_user_outline($course, $user, $mod, $data) {
$result->time = $lastrecord->timemodified;
if ($grade) {
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info .= ', ' . get_string('grade') . ': ' . $grade->str_long_grade;
+ $result->info .= ', ' . get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
}
return $result;
@@ -1206,9 +1206,9 @@ function data_user_outline($course, $user, $mod, $data) {
'time' => grade_get_date_for_user_grade($grade, $user),
];
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
+ $result->info = get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
return $result;
@@ -1233,12 +1233,12 @@ function data_user_complete($course, $user, $mod, $data) {
if (!empty($grades->items[0]->grades)) {
$grade = reset($grades->items[0]->grades);
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . $grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
} else {
- echo $OUTPUT->container(get_string('grade') . ': ' . get_string('hidden', 'grades'));
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . get_string('hidden', 'grades'));
}
}
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 078e80cd162..81f2899ac24 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -263,9 +263,9 @@ function glossary_user_outline($course, $user, $mod, $glossary) {
if ($grade) {
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info .= ', ' . get_string('grade') . ': ' . $grade->str_long_grade;
+ $result->info .= ', ' . get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
}
return $result;
@@ -274,9 +274,9 @@ function glossary_user_outline($course, $user, $mod, $glossary) {
'time' => grade_get_date_for_user_grade($grade, $user),
];
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
+ $result->info = get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
return $result;
@@ -321,12 +321,12 @@ function glossary_user_complete($course, $user, $mod, $glossary) {
if (!empty($grades->items[0]->grades)) {
$grade = reset($grades->items[0]->grades);
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . $grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
} else {
- echo $OUTPUT->container(get_string('grade') . ': ' . get_string('hidden', 'grades'));
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . get_string('hidden', 'grades'));
}
}
diff --git a/mod/lesson/index.php b/mod/lesson/index.php
index 7fd8fae3236..6b425ecb8b2 100644
--- a/mod/lesson/index.php
+++ b/mod/lesson/index.php
@@ -72,7 +72,7 @@ $usesections = course_format_uses_sections($course->format);
$timenow = time();
$strname = get_string("name");
-$strgrade = get_string("grade");
+$strgrade = get_string("gradenoun");
$strdeadline = get_string("deadline", "lesson");
$strnodeadline = get_string("nodeadline", "lesson");
$table = new html_table();
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 45444fcc958..b0a0761cc36 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -408,9 +408,9 @@ function lesson_user_outline($course, $user, $mod, $lesson) {
}
} else {
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $return->info = get_string('grade') . ': ' . $grade->str_long_grade;
+ $return->info = get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $return->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $return->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
$return->time = grade_get_date_for_user_grade($grade, $user);
@@ -462,9 +462,9 @@ function lesson_user_complete($course, $user, $mod, $lesson) {
}
} else {
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $status = get_string("grade") . ': ' . $grade->str_long_grade;
+ $status = get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $status = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $status = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
}
diff --git a/mod/lesson/settings.php b/mod/lesson/settings.php
index 213743ac827..2147a814dde 100644
--- a/mod/lesson/settings.php
+++ b/mod/lesson/settings.php
@@ -152,7 +152,7 @@ if ($ADMIN->fulltree) {
array('value' => '1', 'adv' => true), $pages));
// Grade.
- $settings->add(new admin_setting_heading('lesson/grade', get_string('grade'), ''));
+ $settings->add(new admin_setting_heading('lesson/grade', get_string('gradenoun'), ''));
$settings->add(new admin_setting_configselect_with_advanced('mod_lesson/practice',
get_string('practice', 'lesson'), get_string('practice_help', 'lesson'),
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index c5a2d297f81..f20bbfd0329 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -498,9 +498,9 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
// If the user can't see hidden grades, don't return that information.
$gitem = grade_item::fetch(array('id' => $grades->items[0]->id));
if (!$gitem->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
+ $result->info = get_string('gradenoun') . ': ' . $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
$result->time = grade_get_date_for_user_grade($grade, $user);
@@ -529,12 +529,12 @@ function quiz_user_complete($course, $user, $mod, $quiz) {
// If the user can't see hidden grades, don't return that information.
$gitem = grade_item::fetch(array('id' => $grades->items[0]->id));
if (!$gitem->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
+ echo $OUTPUT->container(get_string('gradenoun').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
} else {
- echo $OUTPUT->container(get_string('grade') . ': ' . get_string('hidden', 'grades'));
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . get_string('hidden', 'grades'));
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.get_string('hidden', 'grades'));
}
diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
index a7ec9b4c683..7ea2812ed55 100644
--- a/mod/quiz/renderer.php
+++ b/mod/quiz/renderer.php
@@ -1029,7 +1029,7 @@ class mod_quiz_renderer extends plugin_renderer_base {
$table->size[] = '';
}
if ($viewobj->gradecolumn) {
- $table->head[] = get_string('grade') . ' / ' .
+ $table->head[] = get_string('gradenoun') . ' / ' .
quiz_format_grade($quiz, $quiz->grade);
$table->align[] = 'center';
$table->size[] = '';
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 022c11063cc..05271e4806d 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -664,7 +664,7 @@ class quiz_overview_report extends quiz_attempts_report {
protected static function get_chart($labels, $data) {
$chart = new \core\chart_bar();
$chart->set_labels($labels);
- $chart->get_xaxis(0, true)->set_label(get_string('grade'));
+ $chart->get_xaxis(0, true)->set_label(get_string('gradenoun'));
$yaxis = $chart->get_yaxis(0, true);
$yaxis->set_label(get_string('participants'));
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 2b6160d5a98..2f96461c58d 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -358,9 +358,9 @@ function scorm_user_outline($course, $user, $mod, $scorm) {
'time' => grade_get_date_for_user_grade($grade, $user),
];
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- $result->info = get_string('grade') . ': '. $grade->str_long_grade;
+ $result->info = get_string('gradenoun') . ': '. $grade->str_long_grade;
} else {
- $result->info = get_string('grade') . ': ' . get_string('hidden', 'grades');
+ $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
}
return $result;
@@ -401,12 +401,12 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
if (!empty($grades->items[0]->grades)) {
$grade = reset($grades->items[0]->grades);
if (!$grade->hidden || has_capability('moodle/grade:viewhidden', context_course::instance($course->id))) {
- echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
+ echo $OUTPUT->container(get_string('gradenoun').': '.$grade->str_long_grade);
if ($grade->str_feedback) {
echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
}
} else {
- echo $OUTPUT->container(get_string('grade') . ': ' . get_string('hidden', 'grades'));
+ echo $OUTPUT->container(get_string('gradenoun') . ': ' . get_string('hidden', 'grades'));
}
}
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index 0002df6b07d..18829612aeb 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -198,7 +198,7 @@ class mod_scorm_mod_form extends moodleform_mod {
$mform->addElement('date_time_selector', 'timeclose', get_string("scormclose", "scorm"), array('optional' => true));
// Grade Settings.
- $mform->addElement('header', 'gradesettings', get_string('grade'));
+ $mform->addElement('header', 'gradesettings', get_string('gradenoun'));
// Grade Method.
$mform->addElement('select', 'grademethod', get_string('grademethod', 'scorm'), scorm_get_grade_method_array());
diff --git a/question/type/calculatedmulti/edit_calculatedmulti_form.php b/question/type/calculatedmulti/edit_calculatedmulti_form.php
index bf16bdf377a..98f836456e8 100644
--- a/question/type/calculatedmulti/edit_calculatedmulti_form.php
+++ b/question/type/calculatedmulti/edit_calculatedmulti_form.php
@@ -72,7 +72,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form {
$answeroptions[] = $mform->createElement('text', 'answer',
$label, array('size' => 50));
$answeroptions[] = $mform->createElement('select', 'fraction',
- get_string('grade'), $gradeoptions);
+ get_string('gradenoun'), $gradeoptions);
$repeated[] = $mform->createElement('group', 'answeroptions',
$label, $answeroptions, null, false);
diff --git a/question/type/edit_question_form.php b/question/type/edit_question_form.php
index 02d7d02b7f6..c152fb2b13d 100644
--- a/question/type/edit_question_form.php
+++ b/question/type/edit_question_form.php
@@ -307,7 +307,7 @@ abstract class question_edit_form extends question_wizard_form {
$answeroptions[] = $mform->createElement('text', 'answer',
$label, array('size' => 40));
$answeroptions[] = $mform->createElement('select', 'fraction',
- get_string('grade'), $gradeoptions);
+ get_string('gradenoun'), $gradeoptions);
$repeated[] = $mform->createElement('group', 'answeroptions',
$label, $answeroptions, null, false);
$repeated[] = $mform->createElement('editor', 'feedback',
diff --git a/question/type/multianswer/edit_multianswer_form.php b/question/type/multianswer/edit_multianswer_form.php
index 56e1a55e87b..1b9c07be7a9 100644
--- a/question/type/multianswer/edit_multianswer_form.php
+++ b/question/type/multianswer/edit_multianswer_form.php
@@ -202,7 +202,7 @@ class qtype_multianswer_edit_form extends question_edit_form {
}
$mform->addElement('static', 'sub_'.$sub.'_fraction['.$key.']',
- get_string('grade'));
+ get_string('gradenoun'));
$mform->addElement('static', 'sub_'.$sub.'_feedback['.$key.']',
get_string('feedback', 'question'));
diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php
index c88857f241c..13666e58ea1 100644
--- a/question/type/multichoice/edit_multichoice_form.php
+++ b/question/type/multichoice/edit_multichoice_form.php
@@ -81,7 +81,7 @@ class qtype_multichoice_edit_form extends question_edit_form {
$repeated[] = $mform->createElement('editor', 'answer',
$label, array('rows' => 1), $this->editoroptions);
$repeated[] = $mform->createElement('select', 'fraction',
- get_string('grade'), $gradeoptions);
+ get_string('gradenoun'), $gradeoptions);
$repeated[] = $mform->createElement('editor', 'feedback',
get_string('feedback', 'question'), array('rows' => 1), $this->editoroptions);
$repeatedoptions['answer']['type'] = PARAM_RAW;