MDL-6837 - move warning about pupup blockers into the lang file. Merged from MOODLE_1...

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 72b1afc4fb412c5fcea1c2b6a3ece67b24a5b0bd..0f8a553d80d505a0cecef2026023a7fdb02c0321 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -338,6 +338,7 @@ $string['penaltyfactor'] = 'Penalty factor';
 $string['penaltyscheme'] = 'Apply penalties';
 $string['percentcorrect'] = 'Percent Correct';
 $string['popup'] = 'Show quiz in a "secure" window';
+$string['popupblockerwarning'] = 'This section of the test is in secure mode, this means that you need to take the quiz in a secure window. Please turn off your popup blocker. Thank you.';
 $string['popupnotice'] = 'Students will see this quiz in a secure window';
 $string['preview'] = 'Preview';
 $string['previewquestion'] = 'Preview question';

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index fbabffb680010209992c8ea323cefd8a8a97e909..ddda08f0d4322ef374f290688e327252f413c394 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -59,7 +59,7 @@
 
     //only check pop ups if the user is not a teacher, and popup is set
 
-    $bodytags = (has_capability('mod/quiz:attempt', $context) && $quiz->popup)?'onload="popupchecker(\'This section of the test is in secure mode, this means that you need to take the quiz in a secure window. Please turn off your popup blocker. Thank you.\');"':'';
+    $bodytags = (has_capability('mod/quiz:attempt', $context) && $quiz->popup)?'onload="popupchecker(\'' . get_string('popupblockerwarning', 'quiz') . '\');"':'';
     $PAGE->print_header($course->shortname.': %fullname%','',$bodytags);
 
     echo '<table id="layout-table"><tr>';