Permalink
Browse files

Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle

  • Loading branch information...
dmonllao committed Oct 25, 2017
2 parents 5b93dc8 + 994ccb7 commit 507335e2de9c289016d19f4d7840991e13ca91c7
Showing with 6 additions and 1 deletion.
  1. +1 −0 mod/lesson/lang/en/lesson.php
  2. +5 −1 mod/lesson/locallib.php
@@ -223,6 +223,7 @@
$string['eventquestionviewed'] = 'Question viewed';
$string['false'] = 'False';
$string['fileformat'] = 'File format';
$string['finalwrong'] = 'Not quite.';
$string['finish'] = 'Finish';
$string['firstanswershould'] = 'First answer should jump to the "Correct" page';
$string['firstwrong'] = 'You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)';
@@ -4100,7 +4100,11 @@ public function properties() {
if ($qattempts == 1) {
$result->feedback = $OUTPUT->box(get_string("firstwrong", "lesson"), 'feedback');
} else {
$result->feedback = $OUTPUT->box(get_string("secondpluswrong", "lesson"), 'feedback');
if (!$result->maxattemptsreached) {
$result->feedback = $OUTPUT->box(get_string("secondpluswrong", "lesson"), 'feedback');
} else {
$result->feedback = $OUTPUT->box(get_string("finalwrong", "lesson"), 'feedback');
}
}
} else {
$result->feedback = '';

0 comments on commit 507335e

Please sign in to comment.