Put back spaces in code that Martin Dougiamass stripped out of the lang strings witho...

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 4ca0ba5302b1cebfde81247dbe4a37cc5ffd4dd1..d9996761105206ffb870a9f33d4ed90e9895f42a 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -337,6 +337,7 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
     }
     echo ' onchange="document.showbreaks.submit(); return true;" />';
     print_string('reordertool', 'quiz');
+    echo ' ';
     helpbutton('reorderingtool', get_string('reorderingtool', 'quiz'), 'quiz');
     
     echo '<div align="center"><input type="submit" name="repaginate" value="'. get_string('go') .'" /></div>';

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index f92c6093c8410fc4034a2d59a030bb16279eddf8..690bf767f7602e76d3296f3a136240b776dde274 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -334,10 +334,10 @@
                     $lastattempttime = $lastattempt->timefinish;
                     if ($numattempts == 1 && $quiz->delay1 && $timenow <= $lastattempttime + $quiz->delay1) {
                         $tempunavailable = get_string('temporaryblocked', 'quiz') .
-                                '<b>'. userdate($lastattempt + $quiz->delay1). '<b>';
+                                ' <b>'. userdate($lastattempt + $quiz->delay1). '<b>';
                     } else if ($numattempts > 1 && $quiz->delay2 && $timenow <= $lastattempttime +  $quiz->delay2) {
                         $tempunavailable = get_string('temporaryblocked', 'quiz') .
-                                '<b>'. userdate($lastattempt + $quiz->delay2). '<b>';
+                                ' <b>'. userdate($lastattempt + $quiz->delay2). '<b>';
                     }
 
                     // If so, display a message and prevent the start button from appearing.

diff --git a/question/format/webct/format.php b/question/format/webct/format.php
index e2d2f91f0ebea525652aa35d7a74adeaa39b9ed4..ca5f046a6713834adefefbd69b08e36cd0ce0d6c 100644 (file)
--- a/question/format/webct/format.php
+++ b/question/format/webct/format.php
@@ -366,7 +366,7 @@ class qformat_webct extends qformat_default {
                             case SHORTANSWER:
                                 if ($maxfraction != 1) {
                                     $maxfraction = $maxfraction * 100;
-                                    $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
+                                    $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).' '.get_string("fractionsnomax", "quiz", $maxfraction);
                                     $QuestionOK = FALSE;
                                 }
                                 break;
@@ -375,7 +375,7 @@ class qformat_webct extends qformat_default {
                                 if ($question->single) {
                                     if ($maxfraction != 1) {
                                         $maxfraction = $maxfraction * 100;
-                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsnomax", "quiz", $maxfraction);
+                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).' '.get_string("fractionsnomax", "quiz", $maxfraction);
                                         $QuestionOK = FALSE;
                                     }
                                 } else {
@@ -383,7 +383,7 @@ class qformat_webct extends qformat_default {
                                     if ($totalfraction != 1) {
                                 echo "<p>$totalfraction</p>";
                                         $totalfraction = $totalfraction * 100;
-                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).get_string("fractionsaddwrong", "quiz", $totalfraction);
+                                        $errors[] = "'$question->name': ".get_string("wronggrade", "quiz", $nLineCounter).' '.get_string("fractionsaddwrong", "quiz", $totalfraction);
                                         $QuestionOK = FALSE;
                                     }
                                 }

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 064e814ae80a5f25a0f480910c35625a32ba6996..7e2dacd8f1ddf38db1548881355866fa49b3aada 100644 (file)
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -700,6 +700,7 @@ class default_questiontype {
                 if ($cmoptions->penaltyscheme) {
                     // print details of grade adjustment due to penalties
                     if ($state->last_graded->raw_grade > $state->last_graded->grade){
+                        echo ' ';
                         print_string('gradingdetailsadjustment', 'quiz', $grade);
                     }
                     // print info about new penalty
@@ -707,11 +708,13 @@ class default_questiontype {
                     if (($state->last_graded->raw_grade < $question->maxgrade) and (QUESTION_EVENTCLOSEANDGRADE !== $state->event)) {
                         if ('' !== $state->last_graded->penalty && ((float)$state->last_graded->penalty) > 0.0) {
                             // A penalty was applied so display it
+                            echo ' ';
                             print_string('gradingdetailspenalty', 'quiz', $state->last_graded->penalty);
                         } else {
                             /* No penalty was applied even though the answer was
                             not correct (eg. a syntax error) so tell the student
                             that they were not penalised for the attempt */
+                            echo ' ';
                             print_string('gradingdetailszeropenalty', 'quiz');
                         }
                     }