Bug #5945: Lang string name missmatch when starting quiz attempt. Merged from MOODLE...

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 82076f932fce0a52e3eb675852a74c0c14273e2d..08a4f33e76db4ceff1599a8959a8990abf7945c5 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -87,10 +87,9 @@ $string['commentorgrade'] = 'Make comment or override grade';
 $string['completedon'] = 'Completed on';
 $string['confirmclose'] = 'You are about to close this attempt. Once you close the attempt you will no longer be able to change your answers.';
 $string['confirmserverdelete'] = 'Are you sure you want to remove the server <b>$a</b> from the list?';
-$string['confirmstartattempt'] = 'The Quiz has a time limit. Are you sure that you wish to start?';
-$string['confirmstartattemptnotimelimit'] = 'This quiz has no time limit. Do you wish to proceed?';
-$string['confirmstartnolimit'] = 'This quiz is limited to $a attempts. Accessing the quiz will be counted as an attempt.  Do you wish to proceed?';
-$string['confirmstartlimit'] = 'This quiz has a time limit and is limited to $a attempts. Accessing the quiz will be counted as an attempt.  Do you wish to proceed?';
+$string['confirmstarttimelimit'] = 'The Quiz has a time limit. Are you sure that you wish to start?';
+$string['confirmstartattemptlimit'] = 'This quiz is limited to $a attempts. Accessing the quiz will be counted as an attempt.  Do you wish to proceed?';
+$string['confirmstartattempttimelimit'] = 'This quiz has a time limit and is limited to $a attempts. Accessing the quiz will be counted as an attempt.  Do you wish to proceed?';
 $string['containercategorycreated'] = 'This category has been created to store all the original categories moved to site level due to the causes specified below.';
 $string['continueattemptquiz'] = 'Continue the last attempt';
 $string['copyingfrom'] = 'Creating a copy of the question \'$a\'';

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 5adbaad4a8050721d7038e4e522605a639c9c73b..6755eb918f4882b9ed0dcd970edbfd9dbdfebc85 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -218,14 +218,8 @@
                      'resizeable=no, directories=no, toolbar=no, titlebar=no, location=no, status=no, '+
                      'menubar=no';\n";
                     $jslink  = 'javascript:';
-                    if ($quiz->timelimit && !$quiz->attempts) {
-                        $strconfirmstartattempt = addslashes(get_string("confirmstartattempt","quiz"));
-                        $jslink .=  "if (confirm(\'$strconfirmstartattempt\')) ";
-                    } else if ($quiz->timelimit && $quiz->attempts) {
-                        $strconfirmstartattempt = addslashes(get_string("confirmstartlimit","quiz",$quiz->attempts));
-                        $jslink .=  "if (confirm(\'$strconfirmstartattempt\')) ";
-                    } else if ($quiz->attempts && !$quiz->timelimit) {
-                        $strconfirmstartattempt = addslashes(get_string("confirmstartnolimit","quiz",$quiz->attempts));
+                    $strconfirmstartattempt = confirm_string($quiz->timelimit, $quiz->attempts);
+                    if ($strconfirmstartattempt) {
                         $jslink .=  "if (confirm(\'$strconfirmstartattempt\')) ";
                     }
                     $jslink .= "var popup = window.open(\\'$attempturl\\', \\'quizpopup\\', windowoptions);";
@@ -319,13 +313,8 @@
                 if ($overallstats and $numattempts and $quiz->grade) {
                     print_heading("$strbestgrade: $mygrade / $quiz->grade.");
                 }
-                if ($quiz->timelimit && !$quiz->attempts) {
-                    $strconfirmstartattempt = addslashes(get_string("confirmstartattempt","quiz"));
-                } else if ($quiz->timelimit && $quiz->attempts) {
-                    $strconfirmstartattempt = addslashes(get_string("confirmstartattempttimelimit","quiz",$quiz->attempts));
-                } else if ($quiz->attempts && !$quiz->timelimit) {
-                    $strconfirmstartattempt = addslashes(get_string("confirmstartattemptnotimelimit","quiz",$quiz->attempts));
-                }
+                
+                $strconfirmstartattempt = confirm_string($quiz->timelimit, $quiz->attempts);
 
                 echo "<br />";
                 echo "</p>";
@@ -395,5 +384,16 @@
         }
         return true;
     }
+    
+    function confirm_string($timelimit, $attempts) {
+        if ($timelimit && $attempts) {
+            return addslashes(get_string("confirmstartattempttimelimit","quiz", $attempts));
+        } else if ($timelimit) {
+            return addslashes(get_string("confirmstarttimelimit","quiz"));
+        } else if ($attempts) {
+            return addslashes(get_string("confirmstartattemptlimit","quiz", $attempts));
+        }
+        return "";
+    }
 
 ?>