From: tjhunt Date: Wed, 19 Sep 2007 15:52:27 +0000 (+0000) Subject: MDL-10972 - The lang string 'fullname', which is normally used for course fullnames... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=260812ba065fcd46efe06c10aa4af2dd2162fe88;p=moodle.git MDL-10972 - The lang string 'fullname', which is normally used for course fullnames, was being used for a person's full name in some quiz reports. This dual usage is not translatable into all languages. Merged from MOODLE_18_STABLE. --- diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php index ea18f345a1..e38d10fe49 100644 --- a/mod/quiz/report/grading/report.php +++ b/mod/quiz/report/grading/report.php @@ -196,7 +196,7 @@ class quiz_report extends quiz_default_report { // set up table $tablecolumns = array('picture', 'fullname', 'timefinish', 'grade'); - $tableheaders = array('', get_string('fullname'), get_string("completedon", "quiz"), ''); + $tableheaders = array('', get_string('name'), get_string("completedon", "quiz"), ''); $table = new flexible_table('mod-quiz-report-grading'); diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index b892c070d4..71e2f321e8 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -91,7 +91,7 @@ class quiz_report extends quiz_default_report { // Define table columns $tablecolumns = array('checkbox', 'picture', 'fullname', 'timestart', 'timefinish', 'duration'); - $tableheaders = array(NULL, '', get_string('fullname'), get_string('startedon', 'quiz'), get_string('timecompleted','quiz'), get_string('attemptduration', 'quiz')); + $tableheaders = array(NULL, '', get_string('name'), get_string('startedon', 'quiz'), get_string('timecompleted','quiz'), get_string('attemptduration', 'quiz')); if ($quiz->grade and $quiz->sumgrades) { $tablecolumns[] = 'sumgrades'; @@ -188,7 +188,7 @@ class quiz_report extends quiz_default_report { $formatg->set_align('center'); // Here starts workshhet headers - $headers = array(get_string('fullname'), get_string('startedon', 'quiz'), get_string('timecompleted', 'quiz'), get_string('attemptduration', 'quiz')); + $headers = array(get_string('name'), get_string('startedon', 'quiz'), get_string('timecompleted', 'quiz'), get_string('attemptduration', 'quiz')); if ($quiz->grade and $quiz->sumgrades) { $headers[] = get_string('grade', 'quiz').'/'.$quiz->grade; @@ -240,7 +240,7 @@ class quiz_report extends quiz_default_report { $formatg->set_align('center'); // Here starts workshhet headers - $headers = array(get_string('fullname'), get_string('startedon', 'quiz'), get_string('timecompleted', 'quiz'), get_string('attemptduration', 'quiz')); + $headers = array(get_string('name'), get_string('startedon', 'quiz'), get_string('timecompleted', 'quiz'), get_string('attemptduration', 'quiz')); if ($quiz->grade and $quiz->sumgrades) { $headers[] = get_string('grade', 'quiz').'/'.$quiz->grade; @@ -268,7 +268,7 @@ class quiz_report extends quiz_default_report { header("Cache-Control: must-revalidate,post-check=0,pre-check=0"); header("Pragma: public"); - $headers = get_string('fullname')."\t".get_string('startedon', 'quiz')."\t".get_string('timecompleted', 'quiz')."\t".get_string('attemptduration', 'quiz'); + $headers = get_string('name')."\t".get_string('startedon', 'quiz')."\t".get_string('timecompleted', 'quiz')."\t".get_string('attemptduration', 'quiz'); if ($quiz->grade and $quiz->sumgrades) { $headers .= "\t".get_string('grade', 'quiz')."/".$quiz->grade;