Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

moodle · Jul 6, 2011 · 1a3c5d2 · 1a3c5d2
2 parents 8323432 + a58f4d5
commit 1a3c5d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php
@@ -152,7 +152,10 @@ public function get_content() {
             $shtml .= '<tr><td>';
             $shtml .= get_string('activitiescompleted', 'completion');
             $shtml .= '</td><td style="text-align: right">';
-            $shtml .= $activities_complete.' of '.count($activities);
+            $a = new stdClass();
+            $a->first = $activities_complete;
+            $a->second = count($activities);
+            $shtml .= get_string('firstofsecond', 'block_completionstatus', $a);
             $shtml .= '</td></tr>';
         }
 
@@ -162,7 +165,10 @@ public function get_content() {
             $phtml  = '<tr><td>';
             $phtml .= get_string('prerequisitescompleted', 'completion');
             $phtml .= '</td><td style="text-align: right">';
-            $phtml .= $prerequisites_complete.' of '.count($prerequisites);
+            $a = new stdClass();
+            $a->first = $prerequisites_complete;
+            $a->second = count($prerequisites);
+            $shtml .= get_string('firstofsecond', 'block_completionstatus', $a);
             $phtml .= '</td></tr>';
 
             $shtml = $phtml . $shtml;

diff --git a/blocks/completionstatus/lang/en/block_completionstatus.php b/blocks/completionstatus/lang/en/block_completionstatus.php
@@ -3,5 +3,6 @@
 $string['completionprogressdetails'] = 'Completion progress details';
 $string['completionstatus'] = 'Course completion status';
 $string['criteriagroup'] = 'Criteria group';
+$string['firstofsecond'] = '{$a->first} of {$a->second}';
 $string['pluginname'] = 'Course completion status';
 $string['requirement'] = 'Requirement';