Bug #6157 - lang strings using concatenation, not $a. Merged from MOODLE_16_STABLE.

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 67ae0b1e5a2e94a4c5c494147305334a6ac87f0d..a818297c4111a3e8623303b97c3c89717f8e12ca 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -249,7 +249,6 @@ $string['link'] = 'Link';
 $string['listitems'] = 'Listing of Items in Quiz';
 $string['literal'] = 'Literal';
 $string['loguniform'] = 'digits, from a loguniform distribution';
-$string['lowmarkslimit'] = '    Don\'t analyze if score is less than: ';
 $string['makecopy'] = 'Save as new question';
 $string['managetypes'] = 'Manage question types and servers';
 $string['manualgrading'] = 'Grading';
@@ -318,7 +317,7 @@ $string['none']= 'None';
 $string['onlyteachersimport'] = 'Only teachers with editing rights can import questions';
 $string['onlyteachersexport'] = 'Only teachers can export questions';
 $string['optional'] = 'optional';
-$string['outof'] = ' out of a maximum of ';
+$string['outof'] = '$a->grade out of a maximum of $a->maxgrade';
 $string['overdue'] = 'Overdue';
 $string['pagesize'] = 'Attempts shown per page: ';
 $string['paragraphquestion'] = 'Paragraph Question not supported at line $a. The question will be ignored';

diff --git a/lang/en_utf8/quiz_analysis.php b/lang/en_utf8/quiz_analysis.php
index 16b1b8cf2fa265f11284b9b714beebb6587a601c..a72d8e2b91531fe8680a66a45be71f35a0e0d5be 100644 (file)
--- a/lang/en_utf8/quiz_analysis.php
+++ b/lang/en_utf8/quiz_analysis.php
@@ -3,8 +3,8 @@
 $string['analysis'] = 'Item analysis';
 $string['analysisdownload'] = 'Analysis download';
 $string['analysisoptions'] = 'Analysis options';
-$string['attemptselection'] = 'Attempts to analyze per user ';
-$string['lowmarkslimit'] = "Don't analyse if score is less than: ";
+$string['attemptselection'] = 'Attempts to analyze per user';
+$string['lowmarkslimit'] = "Don't analyse if score is less than:";
 $string['attemptsall'] = 'all attempts';
 $string['attemptshighest'] = 'highest grade';
 $string['attemptsfirst'] = 'first attempt';

diff --git a/mod/quiz/review.php b/mod/quiz/review.php
index d6a2ad048b76d1186d13150433cece9534b11005..e6a4bf6928957e512308caf7479644655ba7e203 100644 (file)
--- a/mod/quiz/review.php
+++ b/mod/quiz/review.php
@@ -189,11 +189,13 @@
                 $result->grade = "0.0";
             }
             
+            $a = new stdClass;
             $percentage = round(($attempt->sumgrades/$quiz->sumgrades)*100, 0);
-            $grade = round(($attempt->sumgrades/$quiz->sumgrades)*$quiz->grade, $CFG->quiz_decimalpoints);
+            $a->grade = round(($attempt->sumgrades/$quiz->sumgrades)*$quiz->grade, $CFG->quiz_decimalpoints);
+            $a->maxgrade = $quiz->grade;
             $rawscore = round($attempt->sumgrades, $CFG->quiz_decimalpoints);
             $table->data[] = array("$strscore:", "$rawscore/$quiz->sumgrades ($percentage %)");
-            $table->data[] = array("$strgrade:", $grade.get_string('outof', 'quiz').$quiz->grade);
+            $table->data[] = array("$strgrade:", get_string('outof', 'quiz', $a));
         }
     }
     if ($isteacher and $attempt->userid == $USER->id) {