Permalink
Browse files

Merge branch 'MDL-31702_21' of git://github.com/timhunt/moodle into M…

…OODLE_21_STABLE
  • Loading branch information...
2 parents 8135ecf + 98d2e58 commit 421a8533c558db1037148fdd25181b8cc05bb668 Sam Hemelryk committed Mar 12, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −1 mod/quiz/lang/en/quiz.php
  2. +2 −1 mod/quiz/locallib.php
View
2 mod/quiz/lang/en/quiz.php
@@ -128,7 +128,7 @@
$string['cannotsavequestion'] = 'Cannot save question list';
$string['cannotsetgrade'] = 'Could not set a new maximum grade for the quiz';
$string['cannotsetsumgrades'] = 'Failed to set sumgrades';
-$string['cannotstartgradesmismatch'] = 'Cannot start an attempt at this quiz. The quiz is supposed to be graded, but there are no questions in the quiz that are worth any marks.';
+$string['cannotstartgradesmismatch'] = 'Cannot start an attempt at this quiz. The quiz is set to be graded out of {$a->grade}, but none of the questions in the quiz have a grade. This can be fixed on the \'Edit quiz\' page.';
$string['cannotstartmissingquestion'] = 'Cannot start an attempt at this quiz. The quiz definition includes a question that does not exist.';
$string['cannotstartnoquestions'] = 'Cannot start an attempt at this quiz. The quiz has not been set up yet. No questions have been added.';
$string['cannotwrite'] = 'Cannot write to export file ({$a})';
View
3 mod/quiz/locallib.php
@@ -80,7 +80,8 @@ function quiz_create_attempt($quiz, $attemptnumber, $lastattempt, $timenow, $isp
if ($quiz->sumgrades < 0.000005 && $quiz->grade > 0.000005) {
throw new moodle_exception('cannotstartgradesmismatch', 'quiz',
- new moodle_url('/mod/quiz/view.php', array('q' => $quiz->id)));
+ new moodle_url('/mod/quiz/view.php', array('q' => $quiz->id)),
+ array('grade' => quiz_format_grade($quiz, $quiz->grade)));
}
if ($attemptnumber == 1 || !$quiz->attemptonlast) {

0 comments on commit 421a853

Please sign in to comment.