From e872e9b5a7de02969a822760856c6bda4711cced Mon Sep 17 00:00:00 2001 From: roileviK Date: Sun, 20 Jul 2025 15:01:20 +0300 Subject: [PATCH 1/3] KMS-42220 fix grade string reference - add kalvidassign component --- mod/kalvidassign/renderer.php | 6 +++--- mod/kalvidassign/single_submission_form.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php index 551e24af..41d8407b 100644 --- a/mod/kalvidassign/renderer.php +++ b/mod/kalvidassign/renderer.php @@ -366,7 +366,7 @@ public function col_status($data) { $buttontext = get_string('update'); } else { $class = 's0'; - $buttontext = get_string('grade'); + $buttontext = get_string('grade', 'kalvidassign'); } if (!$submitted) { @@ -1126,7 +1126,7 @@ public function display_grade_feedback($kalvidassign, $context) { echo ' '; echo ''; echo '
'; - echo get_string("grade").': '.$grade->str_long_grade; + echo get_string('grade', 'kalvidassign').': '.$grade->str_long_grade; echo '
'; echo '
'; @@ -1149,7 +1149,7 @@ public function render_kalvidassign_course_index_summary(kalvidassign_course_ind $strsectionname = $indexsummary->courseformatname; $strduedate = get_string('duedate', 'kalvidassign'); $strsubmission = get_string('submission', 'kalvidassign'); - $strgrade = get_string('grade'); + $strgrade = get_string('grade', 'kalvidassign'); $table = new html_table(); if ($indexsummary->usesections) { diff --git a/mod/kalvidassign/single_submission_form.php b/mod/kalvidassign/single_submission_form.php index 8a9afe72..c203bf69 100644 --- a/mod/kalvidassign/single_submission_form.php +++ b/mod/kalvidassign/single_submission_form.php @@ -87,7 +87,7 @@ public function definition() { $grademenu = make_grades_menu($this->_customdata->cminstance->grade); $grademenu['-1'] = get_string('nograde'); - $mform->addElement('select', 'xgrade', get_string('grade').':', $grademenu, $attributes); + $mform->addElement('select', 'xgrade', get_string('grade', 'kalvidassign').':', $grademenu, $attributes); if (isset($submission->grade)) { $mform->setDefault('xgrade', $this->_customdata->submission->grade ); From 2e26a8d8ae230f6933d84e7310092f21d59d8fad Mon Sep 17 00:00:00 2001 From: roileviK Date: Sun, 20 Jul 2025 17:12:33 +0300 Subject: [PATCH 2/3] SUP-42220 remove deprecated grade string --- mod/kalvidassign/lang/en/kalvidassign.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/kalvidassign/lang/en/kalvidassign.php b/mod/kalvidassign/lang/en/kalvidassign.php index 2fe1956f..5e82b409 100644 --- a/mod/kalvidassign/lang/en/kalvidassign.php +++ b/mod/kalvidassign/lang/en/kalvidassign.php @@ -48,7 +48,6 @@ $string['emptyentryid'] = 'Video assignment was not submitted correctly. Please try to resubmit.'; $string['deleteallsubmissions'] = 'Delete all video submissions'; $string['fullname'] = 'Name'; -$string['grade'] = 'Grade'; $string['submissioncomment'] = 'Comment'; $string['timemodified'] = 'Last modified (Submission)'; $string['grademodified'] = 'Last modified (Grade)'; From f62d8f820511cab8e4053c78889ea577527e9694 Mon Sep 17 00:00:00 2001 From: roileviK Date: Sun, 20 Jul 2025 17:14:23 +0300 Subject: [PATCH 3/3] SUP-42220 use updated gradeverb and gradenoun core moodle strings --- mod/kalvidassign/renderer.php | 8 ++++---- mod/kalvidassign/single_submission_form.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php index 41d8407b..72287e07 100644 --- a/mod/kalvidassign/renderer.php +++ b/mod/kalvidassign/renderer.php @@ -366,7 +366,7 @@ public function col_status($data) { $buttontext = get_string('update'); } else { $class = 's0'; - $buttontext = get_string('grade', 'kalvidassign'); + $buttontext = get_string('gradeverb'); } if (!$submitted) { @@ -873,7 +873,7 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all' $baseurl = new moodle_url('/mod/kalvidassign/grade_submissions.php', array('cmid' => $cm->id)); $col1 = get_string('fullname', 'kalvidassign'); - $col2 = get_string('grade', 'kalvidassign'); + $col2 = get_string('gradenoun'); $col3 = get_string('submissioncomment', 'kalvidassign'); $col4 = get_string('timemodified', 'kalvidassign'); $col5 = get_string('grademodified', 'kalvidassign'); @@ -1126,7 +1126,7 @@ public function display_grade_feedback($kalvidassign, $context) { echo ' '; echo ''; echo '
'; - echo get_string('grade', 'kalvidassign').': '.$grade->str_long_grade; + echo get_string('gradenoun').': '.$grade->str_long_grade; echo '
'; echo '
'; @@ -1149,7 +1149,7 @@ public function render_kalvidassign_course_index_summary(kalvidassign_course_ind $strsectionname = $indexsummary->courseformatname; $strduedate = get_string('duedate', 'kalvidassign'); $strsubmission = get_string('submission', 'kalvidassign'); - $strgrade = get_string('grade', 'kalvidassign'); + $strgrade = get_string('gradenoun'); $table = new html_table(); if ($indexsummary->usesections) { diff --git a/mod/kalvidassign/single_submission_form.php b/mod/kalvidassign/single_submission_form.php index c203bf69..058cd05f 100644 --- a/mod/kalvidassign/single_submission_form.php +++ b/mod/kalvidassign/single_submission_form.php @@ -87,7 +87,7 @@ public function definition() { $grademenu = make_grades_menu($this->_customdata->cminstance->grade); $grademenu['-1'] = get_string('nograde'); - $mform->addElement('select', 'xgrade', get_string('grade', 'kalvidassign').':', $grademenu, $attributes); + $mform->addElement('select', 'xgrade', get_string('gradenoun').':', $grademenu, $attributes); if (isset($submission->grade)) { $mform->setDefault('xgrade', $this->_customdata->submission->grade );