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

This commit is contained in:
Sam Hemelryk 2011-07-06 11:19:27 +08:00
commit 1a3c5d2366
2 changed files with 9 additions and 2 deletions

View File

@ -152,7 +152,10 @@ class block_completionstatus extends block_base {
$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 @@ class block_completionstatus extends block_base {
$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;

View File

@ -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';