quiz editing: MDL-17409 converted strings to use $a

converted concatenation to use $a instead for new (committed with the rest of Quiz UI redesign project) strings, created new strings for old strings that did not yet use $a

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 9891935251bac134d0444ad90307382b86b9f318..664190df8e9daa533eb5c6d64c04c40cabe3e528 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -302,7 +302,6 @@ $string['formatnotimplemented'] = 'This format has not been correctly implemente
 $string['formulaerror'] = 'Formula errors!';
 $string['fractionsaddwrong'] = 'The positive grades you have chosen do not add up to 100%%<br />Instead, they add up to $a%%<br />Do you want to go back and fix this question?';
 $string['fractionsnomax'] = 'One of the answers should be 100%%, so that it is<br />possible to get a full grade for this question.<br />Do you want to go back and fix this question?';
-$string['fromcategory'] = 'from category:';
 $string['fromfile'] = 'from file:';
 $string['functiontakesatleasttwo'] = 'The function $a must have at least two arguments';
 $string['functiontakesnoargs'] = 'The function $a does not take any arguments';
@@ -405,7 +404,7 @@ $string['missingquestiontext'] = 'Missing question text';
 $string['missingword'] = 'Missing word format';
 $string['modulename'] = 'Quiz';
 $string['modulenameplural'] = 'Quizzes';
-$string['moveselectedonpage'] = 'Move selected questions to page';
+$string['moveselectedonpage'] = 'Move selected questions to page: $a';
 $string['moveto'] = 'Move to >>';
 $string['multianswer'] = 'Embedded Answers (Cloze)';
 $string['multichoice'] = 'Multiple Choice';
@@ -452,6 +451,7 @@ $string['numattempts'] = '$a->studentnum $a->studentstring have made $a->attempt
 $string['numattemptsmade'] = '$a attempts made on this quiz';
 $string['numberabbr'] = '#';
 $string['numerical'] = 'Numerical';
+$string['numquestionsx'] = 'Questions: $a';
 $string['onlyteachersexport'] = 'Only teachers can export questions';
 $string['onlyteachersimport'] = 'Only teachers with editing rights can import questions';
 $string['open'] = 'Started';
@@ -507,6 +507,7 @@ $string['questionsinclhidden'] = 'Questions (including hidden)';
 $string['questionsinthisquiz'] = 'Questions in this quiz';
 $string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These question will not be deleted from these quizzes but only from the category list.)';
 $string['questionsperpage'] = 'Questions per page';
+$string['questionsperpagex'] = 'Questions per page: $a';
 $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['questiontext'] = 'Question text';
 $string['questiontextisempty'] = '[Empty question text]';
@@ -644,6 +645,7 @@ $string['showteacherattempts'] = 'Show teacher attempts';
 $string['shuffle'] = 'Shuffle';
 $string['shuffleanswers'] = 'Shuffle answers';
 $string['shufflequestions'] = 'Shuffle questions';
+$string['shufflequestionsx'] = 'Shuffle questions: $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.';
 $string['shufflewithin'] = 'Shuffle within questions';
 $string['significantfigures'] = 'with $a';
@@ -683,7 +685,7 @@ $string['tolerance'] = 'Tolerance';
 $string['tolerancetype'] = 'Tolerance Type';
 $string['toomanyrandom'] = 'The number of random questions required is more than are still available in the category!';
 $string['top'] = 'Top';
-$string['totalpoints'] = 'Total of grades:';
+$string['totalpointsx'] = 'Total of grades: $a';
 $string['totalquestionsinrandomqcategory'] = 'Total of $a questions in category.';
 $string['true'] = 'True';
 $string['truefalse'] = 'True/False';
@@ -713,6 +715,7 @@ $string['withselected'] = 'With selected';
 $string['withsummary'] = 'with Summary Statistics';
 $string['wronggrade'] = 'Wrong grade (after line $a) :';
 $string['wronguse'] = 'You can not use this page like that';
+$string['xfromcategory'] = '$a from category:';
 $string['xhtml'] = 'XHTML Format';
 $string['xml'] = 'Moodle XML format';
 $string['xmlimportnoname'] = 'Missing question name in xml file';

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 805f9d9eb987c3e707baccba310b92102af69ae6..6580d8472ec8c2193eed81e26e006626dda680ab 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -249,10 +249,11 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
         get_string("areyousuredeleteselected","quiz").'")\'; value="'.
         get_string("deleteselected").'"  '.$disabled.' /></div>';
 
+    $a = '<input name="moveselectedonpagetop" type="text" size="2" '.
+        $pagingdisabled.' />';
+        
     $reordercontrols2top='<div class="moveselectedonpage">'.
-        get_string("moveselectedonpage","quiz") .
-        ': <input name="moveselectedonpagetop" type="text" size="2" '.
-        $pagingdisabled.'  />'.
+        get_string("moveselectedonpage","quiz", $a) .
         '<input type="submit" name="savechanges" value="'.
         $strmove.'"  '.$pagingdisabled.' />'.'
         <br /><input type="submit" name="savechanges" value="'.
@@ -260,9 +261,8 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
     $reordercontrols2bottom='<div class="moveselectedonpage">'.
         '<input type="submit" name="savechanges" value="'.
         $strreorderquestions.'"  '.$movedisabled.' /><br />'.
-        get_string("moveselectedonpage","quiz") .
-        ': <input name="moveselectedonpagebottom" type="text" size="2"  '.
-        $pagingdisabled.' />'.'<input type="submit" name="savechanges" value="'.
+        get_string("moveselectedonpage","quiz",$a) .
+        '<input type="submit" name="savechanges" value="'.
         $strmove.'"  '.$pagingdisabled.' /> '.'</div>';
 
     $reordercontrols3='<a href="javascript:select_all_in(\'FORM\',null,'.
@@ -787,8 +787,7 @@ function quiz_print_randomquestion(&$question, &$pageurl, &$quiz,$quiz_qbanktool
 
     echo '<div class="randomquestionfromcategory">';
     print_question_icon($question);
-    print_string('random','quiz');
-    echo " ".get_string("fromcategory",'quiz')."</div>";
+    echo " ".get_string("xfromcategory",'quiz',get_string('random','quiz'))."</div>";
 
     $a = new stdClass;
     $a->arrow = $THEME->rarrow;
@@ -1523,11 +1522,10 @@ function quiz_print_status_bar($quiz,$sumgrades){
     global $CFG;
     $numberofquestions=quiz_number_of_questions_in_quiz($quiz->questions);
     ?><div class="statusdisplay"><span class="totalpoints">
-    <?php echo get_string("totalpoints","quiz") ?></span>
-    <?php echo $sumgrades; ?>
+    <?php echo get_string("totalpointsx","quiz",$sumgrades) ?></span>
     | <span class="numberofquestions">
     <?php
-    echo get_string("questions","quiz").": $numberofquestions"
+    echo get_string("numquestionsx","quiz",$numberofquestions);
     ?></span>
     | <span class="quizopeningstatus">
     <?php
@@ -1545,22 +1543,22 @@ function quiz_print_status_bar($quiz,$sumgrades){
     if($quiz->shufflequestions){
         echo "*";
     }
-    echo get_string("shufflequestions",'quiz').": ";
     if($quiz->shufflequestions){
-        echo get_string("yes");
+        $shuffleqs= get_string("yes");
     }
     else{
-        echo get_string("no");
+        $shuffleqs= get_string("no");
     }
+    echo get_string("shufflequestionsx",'quiz',$shuffleqs);
     echo " | ";
-    print_string("questionsperpage","quiz");
     $questionsperpagebool = ($quiz->questionsperpage < 1) ? 0 : 1;
     if($questionsperpagebool){
-        echo ": $quiz->questionsperpage";
+        $valquestionsparpage=$quiz->questionsperpage;
     }else{
-        echo ": ".get_string("unlimited");
+        $valquestionsparpage=get_string("unlimited");
     }
-
+    print_string("questionsperpagex","quiz",$valquestionsparpage);
+    
     ?>
     </div>
     <?php