quiz editing: MDL-17288 Lang string issues

questionsperpageselected and shufflequestionsselected from lang/en_utf8/quiz.php now use a $a, rather than concatenation.

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 65a7d3569f050fb523352e8a4e9b257afac0b95a..350c41663b48105c4230e7821e77ac5ac9467cb6 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -716,6 +716,6 @@ $string['addnewquestionsqbank'] = 'Add questions to the category $a in the \'Que
 $string['empty'] = 'Empty';
 $string['quizopened'] = 'This quiz is open.';
 $string['areyousuredeleteselected'] = 'Are you sure you want to delete the selected questions?';
-$string['questionsperpageselected'] = 'Questions per page has been set so the paging is currently fixed. As a result, the paging controls have been disabled. You can change this in ';
-$string['shufflequestionsselected'] = '* Shuffle questions has been set so question order is random. As a result, the button Reorder questions has been disabled. You can change this in ';
+$string['questionsperpageselected'] = 'Questions per page has been set so the paging is currently fixed. As a result, the paging controls have been disabled. You can change this in $a.';
+$string['shufflequestionsselected'] = '* Shuffle questions has been set so question order is random. As a result, the button Reorder questions has been disabled. You can change this in $a.';
 ?>

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 56bb9020eefcc1bc1b4a010a5755725fc6b5b5b6..89c231a3d373341065b691b7e611d4255cd96dd1 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -780,21 +780,21 @@ if($quiz_has_attempts){
     $notifystring.=notify($string,$style='notifyproblem', $align='center', $return=true);
 }
 if($questionsperpagebool && $quiz_reordertool){
-    $string=get_string('questionsperpageselected', 'quiz');
     $updateurl=new moodle_url("$CFG->wwwroot/course/mod.php",
             array("return"=>"true","update"=>$quiz->cmid, "sesskey"=>sesskey()));
-    $string.= '<a href="'.$updateurl->out().'">';
-    $string.=get_string('updatethis', '', get_string('modulename', 'quiz'));
-    $string.='</a>.';
+    $linkstring = '<a href="'.$updateurl->out().'">';
+    $linkstring.=get_string('updatethis', '', get_string('modulename', 'quiz'));
+    $linkstring.='</a>';
+    $string=get_string('questionsperpageselected', 'quiz', $linkstring);
     $notifystring.=notify($string,$style='notifyproblem', $align='center', $return=true);
 }
 if($quiz->shufflequestions && $quiz_reordertool){
-    $string=get_string('shufflequestionsselected', 'quiz');
     $updateurl=new moodle_url("$CFG->wwwroot/course/mod.php",
             array("return"=>"true","update"=>$quiz->cmid, "sesskey"=>sesskey()));
-    $string.= '<a href="'.$updateurl->out().'">';
-    $string.=get_string('updatethis', '', get_string('modulename', 'quiz'));
-    $string.='</a>.';
+    $linkstring = '<a href="'.$updateurl->out().'">';
+    $linkstring.=get_string('updatethis', '', get_string('modulename', 'quiz'));
+    $linkstring.='</a>';
+    $string=get_string('shufflequestionsselected', 'quiz',$linkstring);
     $notifystring.=notify($string,$style='notifyproblem', $align='center', $return=true);
 }
 if(!empty($notifystring)){