Merge branch 'MDL-60538-33' of https://github.com/mihailges/moodle in…

…to MOODLE_33_STABLE
moodle · Oct 25, 2017 · 32e3f25c95a7eac1c1295bf1cf09e10201169cdb · 32e3f25
2 parents 8375df3 + c3ddc8e
commit 32e3f25c95a7eac1c1295bf1cf09e10201169cdb
Unified Split

Showing with 6 additions and 1 deletion.

+1 −0 mod/lesson/lang/en/lesson.php

+5 −1 mod/lesson/locallib.php
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.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.)';
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
@@ -4070,7 +4070,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 = '';