From a58f4d5595980b61acb4a793a7e6bee5ad563cac Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Sun, 3 Jul 2011 22:50:44 +0100 Subject: [PATCH] MDL-26626 course competion block - fix hardcoded string --- blocks/completionstatus/block_completionstatus.php | 10 ++++++++-- .../lang/en/block_completionstatus.php | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 2f84a3ce6fb05..9e92f25732071 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -152,7 +152,10 @@ public function get_content() { $shtml .= ''; $shtml .= get_string('activitiescompleted', 'completion'); $shtml .= ''; - $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 .= ''; } @@ -162,7 +165,10 @@ public function get_content() { $phtml = ''; $phtml .= get_string('prerequisitescompleted', 'completion'); $phtml .= ''; - $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 .= ''; $shtml = $phtml . $shtml; diff --git a/blocks/completionstatus/lang/en/block_completionstatus.php b/blocks/completionstatus/lang/en/block_completionstatus.php index a24ec57ab56a0..50bea4e88d16c 100644 --- 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';