Perfecting the wording to distinguish between singular and plural.

diff --git a/blocks/quiz_results/block_quiz_results.php b/blocks/quiz_results/block_quiz_results.php
index e31e1d1d312071ae6f0669d8621a16db366afa28..af7035cbfd126549cc52d5c6140ce10e1aa1e0e5 100644 (file)
--- a/blocks/quiz_results/block_quiz_results.php
+++ b/blocks/quiz_results/block_quiz_results.php
@@ -169,7 +169,9 @@ class block_quiz_results extends block_base {
 
             $rank = 0;
             if(!empty($best)) {
-                $this->content->text .= '<table class="grades"><caption>'.get_string('bestgroupgrades', 'block_quiz_results', $numbest).'</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
+                $this->content->text .= '<table class="grades"><caption>';
+                $this->content->text .= ($numbest == 1?get_string('bestgroupgrade', 'block_quiz_results'):get_string('bestgroupgrades', 'block_quiz_results', $numbest));
+                $this->content->text .= '</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
                 foreach($best as $groupid => $averagegrade) {
                     $this->content->text .= '<tr><td>'.(++$rank).'.</td><td><a href="'.$CFG->wwwroot.'/course/group.php?group='.$groupid.'&amp;id='.$courseid.'">'.$groupgrades[$groupid]['group'].'</a></td><td>';
                     switch($gradeformat) {
@@ -192,7 +194,9 @@ class block_quiz_results extends block_base {
             $rank = 0;
             if(!empty($worst)) {
                 $worst = array_reverse($worst, true);
-                $this->content->text .= '<table class="grades"><caption>'.get_string('worstgroupgrades', 'block_quiz_results', $numworst).'</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
+                $this->content->text .= '<table class="grades"><caption>';
+                $this->content->text .= ($numworst == 1?get_string('worstgroupgrade', 'block_quiz_results'):get_string('worstgroupgrades', 'block_quiz_results', $numworst));
+                $this->content->text .= '</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
                 foreach($worst as $groupid => $averagegrade) {
                     $this->content->text .= '<tr><td>'.(++$rank).'.</td><td><a href="'.$CFG->wwwroot.'/course/group.php?group='.$groupid.'&amp;id='.$courseid.'">'.$groupgrades[$groupid]['group'].'</a></td><td>';
                     switch($gradeformat) {
@@ -277,7 +281,9 @@ class block_quiz_results extends block_base {
 
             $rank = 0;
             if(!empty($best)) {
-                $this->content->text .= '<table class="grades"><caption>'.get_string('bestgrades', 'block_quiz_results', $numbest).'</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
+                $this->content->text .= '<table class="grades"><caption>';
+                $this->content->text .= ($numbest == 1?get_string('bestgrade', 'block_quiz_results'):get_string('bestgrades', 'block_quiz_results', $numbest));
+                $this->content->text .= '</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
                 foreach($best as $userid => $gradeid) {
                     $this->content->text .= '<tr><td>'.(++$rank).'.</td><td><a href="'.$CFG->wwwroot.'/user/view.php?id='.$userid.'&amp;course='.$courseid.'">'.fullname($users[$userid]).'</a></td><td>';
                     switch($gradeformat) {
@@ -300,7 +306,9 @@ class block_quiz_results extends block_base {
             $rank = 0;
             if(!empty($worst)) {
                 $worst = array_reverse($worst, true);
-                $this->content->text .= '<table class="grades"><caption>'.get_string('worstgrades', 'block_quiz_results', $numworst).'</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
+                $this->content->text .= '<table class="grades"><caption>';
+                $this->content->text .= ($numworst == 1?get_string('worstgrade', 'block_quiz_results'):get_string('worstgrades', 'block_quiz_results', $numworst));
+                $this->content->text .= '</caption><colgroup class="number" /><colgroup class="name" /><colgroup class="grade" /><tbody>';
                 foreach($worst as $userid => $gradeid) {
                     $this->content->text .= '<tr><td>'.(++$rank).'.</td><td><a href="'.$CFG->wwwroot.'/user/view.php?id='.$userid.'&amp;course='.$courseid.'">'.fullname($users[$userid]).'</a></td><td>';
                     switch($gradeformat) {

diff --git a/lang/en/block_quiz_results.php b/lang/en/block_quiz_results.php
index e0dff6946b990b8037e499ad2b122751a7b5742b..a10bd96cfe65f43707598d8c64d8df37a2c3ac96 100644 (file)
--- a/lang/en/block_quiz_results.php
+++ b/lang/en/block_quiz_results.php
@@ -1,8 +1,12 @@
 <?php // $Id$
 
+$string['bestgrade'] = 'The highest grade:';
 $string['bestgrades'] = 'The $a highest grades:';
+$string['bestgroupgrade'] = 'The group with the highest average:';
 $string['bestgroupgrades'] = 'The $a groups with the highest average:';
+$string['worstgrade'] = 'The lowest grade:';
 $string['worstgrades'] = 'The $a lowest grades:';
+$string['worstgroupgrade'] = 'The group with the lowest average:';
 $string['worstgroupgrades'] = 'The $a groups with the lowest average:';
 $string['formaltitle'] = 'Quiz Results';
 $string['config_select_quiz'] = 'Which quiz should this block display results from?';