diff --git a/mod/lesson/format.php b/mod/lesson/format.php index 22201b1fdd3..e699122229f 100644 --- a/mod/lesson/format.php +++ b/mod/lesson/format.php @@ -221,7 +221,7 @@ function lesson_save_question_options($question, $lesson) { $totalfraction = round($totalfraction,2); if ($totalfraction != 1) { $totalfraction = $totalfraction * 100; - $result->notice = get_string("fractionsaddwrong", "quiz", $totalfraction); + $result->notice = get_string("fractionsaddwrong", "qtype_multichoice", $totalfraction); return $result; } } diff --git a/question/format.php b/question/format.php index 3460b432860..827636f0e63 100644 --- a/question/format.php +++ b/question/format.php @@ -230,7 +230,7 @@ class qformat_default { echo "{$message}\n"; echo ""; - $this->importerrors++; + $this->importerrors++; } /** diff --git a/question/format/webct/format.php b/question/format/webct/format.php index 2c003d87ca1..6efa010c904 100644 --- a/question/format/webct/format.php +++ b/question/format/webct/format.php @@ -337,7 +337,6 @@ class qformat_webct extends qformat_default { '[+-]?([0-9]+(\\.[0-9]*)?|\\.[0-9]+)((e|E|\\*10\\*\\*)([+-]?[0-9]+|\\([+-]?[0-9]+\\)))?'; $questions = array(); - $errors = array(); $warnings = array(); $webctoptions = array(); @@ -453,7 +452,7 @@ class qformat_webct extends qformat_default { $questionok = false; } if (count($question->answer) < 1) { // A question must have at least 1 answer. - $errors[] = get_string('missinganswer', 'qformat_webct', $nquestionstartline); + $this->error(get_string('missinganswer', 'qformat_webct', $nquestionstartline), '', $question->name); $questionok = false; } else { // Create empty feedback array. @@ -497,8 +496,8 @@ class qformat_webct extends qformat_default { case 'shortanswer': if ($maxfraction != 1) { $maxfraction = $maxfraction * 100; - $errors[] = "'{$question->name}': ".get_string('wronggrade', 'qformat_webct', $nlinecounter) - .' '.get_string('fractionsnomax', 'question', $maxfraction); + $this->error(get_string('wronggrade', 'qformat_webct', $nlinecounter) + .' '.get_string('fractionsnomax', 'question', $maxfraction), '', $question->name);; $questionok = false; } break; @@ -509,16 +508,17 @@ class qformat_webct extends qformat_default { if ($question->single) { if ($maxfraction != 1) { $maxfraction = $maxfraction * 100; - $errors[] = "'{$question->name}': ".get_string('wronggrade', 'qformat_webct', $nlinecounter) - .' '.get_string('fractionsnomax', 'question', $maxfraction); + $this->error(get_string('wronggrade', 'qformat_webct', $nlinecounter) + .' '.get_string('fractionsnomax', 'question', $maxfraction), '', $question->name); $questionok = false; } } else { $totalfraction = round($totalfraction, 2); if ($totalfraction != 1) { $totalfraction = $totalfraction * 100; - $errors[] = "'{$question->name}': ".get_string('wronggrade', 'qformat_webct', $nlinecounter) - .' '.get_string('fractionsaddwrong', 'question', $totalfraction); + $this->error(get_string('wronggrade', 'qformat_webct', $nlinecounter) + .' '.get_string('fractionsaddwrong', 'qtype_multichoice', $totalfraction), + '', $question->name); $questionok = false; } } @@ -852,15 +852,6 @@ class qformat_webct extends qformat_default { } } - if (count($errors) > 0) { - echo '
'.get_string('errorsdetected', 'qformat_webct', count($errors)).'
'.get_string('warningsdetected', 'qformat_webct', count($warnings)).'