Skip to content

Commit

Permalink
MDL-71118 core: Add grade (verb) string.
Browse files Browse the repository at this point in the history 
AMOS BEGIN
 CPY [grade,core],[gradenoun,core]
 CPY [grade,core],[gradeverb,core]
AMOS END
  • Loading branch information
@lucaboesch
lucaboesch committed Apr 17, 2021
1 parent b9c7ea6 commit aee27d0
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 64 deletions.
2 changes: 1 addition & 1 deletion completion/criteria/completion_criteria_grade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function get_title_detailed() {
* @return string
*/
public function get_type_title() {
return get_string('grade');
return get_string('gradenoun');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions course/moodleform_mod.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ public function standard_grading_coursemodule_elements() {

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
Expand All @@ -1012,7 +1012,7 @@ public function standard_grading_coursemodule_elements() {
$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);

Expand Down
2 changes: 1 addition & 1 deletion grade/grading/tests/behat/behat_grading.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function i_go_to_advanced_grading_definition_page($activityname) {
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));

Expand Down
3 changes: 1 addition & 2 deletions grade/report/grader/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,6 @@ public function get_left_rows($displayaverages) {
$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);
Expand Down Expand Up @@ -813,7 +812,7 @@ public function get_right_rows($displayaverages) {
$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();

Expand Down
4 changes: 2 additions & 2 deletions grade/report/overview/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ public function setup_table() {
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);

Expand Down
1 change: 1 addition & 0 deletions lang/en/deprecated.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,4 @@ usernameoridoccurenceerror,core_webservice
addbackpack,core_badges
error:backpacknotavailable,core_badges
error:backpackproblem,core_badges
grade,core
4 changes: 3 additions & 1 deletion lang/en/moodle.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,8 +945,9 @@
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'] = '<a href="https://www.gravatar.com/">Gravatar</a> 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';
Expand Down Expand Up @@ -2322,3 +2323,4 @@

// Deprecated since Moodle 3.11.
$string['hidepicture'] = 'Hide picture';
$string['grade'] = 'Grade';
2 changes: 1 addition & 1 deletion lib/grade/grade_item.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ public function get_name($fulltotal=false) {
}

} else {
return get_string('grade');
return get_string('gradenoun');
}
}

Expand Down
2 changes: 1 addition & 1 deletion mod/assign/feedback/offline/importgradeslib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function init() {

$columns = $this->csvreader->get_columns();

$strgrade = get_string('grade');
$strgrade = get_string('gradenoun');
$strid = get_string('recordid', 'assign');
$strmodified = get_string('lastmodifiedgrade', 'assign');

Expand Down
6 changes: 3 additions & 3 deletions mod/assign/gradingtable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public function __construct(assign $assignment,
}
// Grade.
$columns[] = 'grade';
$headers[] = get_string('grade');
$headers[] = get_string('gradenoun');
if ($this->is_downloading()) {
$gradetype = $this->assignment->get_instance()->grade;
if ($gradetype > 0) {
Expand Down Expand Up @@ -998,7 +998,7 @@ public function col_grade(stdClass $row) {
}

$url = new moodle_url('/mod/assign/view.php', $urlparams);
$link = '<a href="' . $url . '" class="btn btn-primary">' . get_string('grade') . '</a>';
$link = '<a href="' . $url . '" class="btn btn-primary">' . get_string('gradeverb') . '</a>';
$grade .= $link . $separator;
}

Expand Down Expand Up @@ -1241,7 +1241,7 @@ public function col_userid(stdClass $row) {
$noimage = null;

if (!$row->grade) {
$description = get_string('grade');
$description = get_string('gradeverb');
} else {
$description = get_string('updategrade', 'assign');
}
Expand Down
6 changes: 3 additions & 3 deletions mod/assign/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ function assign_print_recent_mod_activity($activity, $courseid, $detail, $modnam

if (isset($activity->grade)) {
echo '<div class="grade">';
echo get_string('grade').': ';
echo get_string('gradenoun') . ': ';
echo $activity->grade;
echo '</div>';
}
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions mod/assign/locallib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4076,7 +4076,7 @@ protected function view_single_grading_panel($args) {
// 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) {
Expand Down Expand Up @@ -4262,7 +4262,7 @@ protected function view_single_grade_page($mform) {
'',
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) {
Expand Down Expand Up @@ -7185,7 +7185,7 @@ public function format_grade_for_log(stdClass $grade) {

$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');
}
Expand Down Expand Up @@ -7647,11 +7647,11 @@ public function add_grade_form_elements(MoodleQuickForm $mform, stdClass $data,
$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();
Expand All @@ -7675,7 +7675,7 @@ public function add_grade_form_elements(MoodleQuickForm $mform, stdClass $data,
} 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)) {
Expand Down
8 changes: 4 additions & 4 deletions mod/assign/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public function render_assign_grading_summary(assign_grading_summary $summary) {
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();
Expand Down Expand Up @@ -426,7 +426,7 @@ public function render_assign_feedback_status(assign_feedback_status $status) {

// Grade.
if (isset($status->gradefordisplay)) {
$cell1content = get_string('grade');
$cell1content = get_string('gradenoun');
$cell2content = $status->gradefordisplay;
$this->add_table_row_tuple($t, $cell1content, $cell2content);

Expand Down Expand Up @@ -1097,7 +1097,7 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
$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);

Expand Down Expand Up @@ -1356,7 +1356,7 @@ public function render_assign_course_index_summary(assign_course_index_summary $
$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) {
Expand Down
8 changes: 4 additions & 4 deletions mod/assign/tests/lib_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ public function test_assign_core_calendar_provide_event_action_gradingduedate_as

// 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());
Expand All @@ -561,7 +561,7 @@ public function test_assign_core_calendar_provide_event_action_gradingduedate_fo

// 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());
Expand All @@ -583,7 +583,7 @@ public function test_assign_core_calendar_provide_event_action_gradingduedate_as

// 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());
Expand All @@ -608,7 +608,7 @@ public function test_assign_core_calendar_provide_event_action_gradingduedate_fo

// 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());
Expand Down
12 changes: 6 additions & 6 deletions mod/data/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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'));
}
}

Expand Down
12 changes: 6 additions & 6 deletions mod/glossary/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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'));
}
}

Expand Down
2 changes: 1 addition & 1 deletion mod/lesson/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

$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();
Expand Down
Loading

0 comments on commit aee27d0

Please sign in to comment.