Fixed some hardcoded strings in GIFT format.

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 2a4a22cf6a05e0b580ceef32e90ea8c9253fd37f..365120897fc96b74ffa420952cc48ebab2849a0b 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -161,6 +161,7 @@ $string['editqcats'] = 'Edit questions categories';
 $string['editquestions'] = 'Edit questions';
 $string['editquiz'] = 'Edit Quiz';
 $string['editquizquestions'] = 'Edit Quiz Questions';
+$string['errorinquestion'] = 'Error in question';
 $string['errormissingquestion'] = 'Error: The system is missing the question with id $a';
 $string['errornotnumbers'] = 'Error - answers must be numeric';
 $string['errorsdetected'] = '$a error(s) detected';
@@ -212,6 +213,12 @@ $string['generalfeedback'] = 'General feedback';
 $string['generatevalue'] = 'Generate a new value between';
 $string['geometric'] = 'Geometric';
 $string['gift'] = 'GIFT format';
+$string['giftleftbraceerror'] = 'Could not find a {';
+$string['giftmatchingformat'] = 'Matching question answers are improperly formatted';
+$string['giftnonumericalanswers'] = 'No answers found for numerical question';
+$string['giftnovalidquestion'] = 'No valid question found';
+$string['giftqtypenotset'] = 'Question type is not set';
+$string['giftrightbraceerror'] = 'Could not find a }';
 $string['grade'] = 'Grade';
 $string['gradeall'] = 'Grade All';
 $string['gradeaverage'] = 'Average grade';

diff --git a/question/format/gift/format.php b/question/format/gift/format.php
index 42c771e1f58140f7d05b3c80404c65674b7b2be2..3ae9e57758222ea454935be0f87e2617baa7334d 100755 (executable)
--- a/question/format/gift/format.php
+++ b/question/format/gift/format.php
@@ -167,13 +167,15 @@ class qformat_gift extends qformat_default {
         // FIND ANSWER section
         $answerstart = strpos($text, "{");
         if ($answerstart === false) {
-            $this->error( 'Could not find a {', $text );
+            $giftleftbraceerror = get_string( 'giftleftbraceerror', 'quiz' );
+            $this->error( $giftleftbraceerror, $text );
             return false;
         }
 
         $answerfinish = strpos($text, "}");
         if ($answerfinish === false) {
-            $this->error( 'Could not find a }', $text );
+            $giftrightbraceerror = get_string( 'giftrightbraceerror', 'quiz' );
+            $this->error( $giftrightbraceerror, $text );
             return false;
         }
 
@@ -246,7 +248,8 @@ class qformat_gift extends qformat_default {
         }
 
         if (!isset($question->qtype)) {
-            $this->error( 'Question type not set', $text );
+            $giftqtypenotset = get_string('giftqtypenotset','quiz');
+            $this->error( $giftqtypenotset, $text );
             return false;
         }
 
@@ -318,7 +321,8 @@ class qformat_gift extends qformat_default {
                 foreach ($answers as $key => $answer) {
                     $answer = trim($answer);
                     if (strpos($answer, "->") === false) {
-                        $this->error('Improperly formatted Matching Question answer', $answer );
+                        $giftmatchingformat = get_string('giftmatchingformat','quiz');
+                        $this->error($giftmatchingformat, $answer );
                         return false;
                         break 2;
                     }
@@ -409,7 +413,8 @@ class qformat_gift extends qformat_default {
     
                 if (count($answers) == 0) {
                     // invalid question
-                    $this->error( 'No answers found in Numerical answer', $text );
+                    $giftnonumericalanswers = get_string('giftnonumericalanswers','quiz');
+                    $this->error( $giftnonumericalanswers, $text );
                     return false;
                     break;
                 }
@@ -466,7 +471,8 @@ class qformat_gift extends qformat_default {
                 break;
 
                 default:
-                    $this->error( 'No valid question detected', $text );
+                    $giftnovalidquestion = get_string('giftnovalidquestion','quiz');
+                    $this->error( $giftnovalidquestion, $text );
                 return false;
                 break;