MDL-14763 new lang strings and MDL-17134

diff --git a/lang/en_utf8/qtype_multianswer.php b/lang/en_utf8/qtype_multianswer.php
index f985d49e20f3a934b09b23e571ba639b5bbc7c69..40f5e1d6e3adefa73da8560cf8a84f458b947230 100644 (file)
--- a/lang/en_utf8/qtype_multianswer.php
+++ b/lang/en_utf8/qtype_multianswer.php
@@ -1,11 +1,20 @@
 <?php
+$string['addingmultianswer'] = 'Adding an Embedded answers (Cloze)';
 $string['correctanswer'] = 'Correct Answer';
 $string['correctanswerandfeedback'] = 'Correct Answer and Feedback';
 $string['decodeverifyquestiontext'] = 'Decode and Verify the Question Text';
+$string['editingmultianswer'] = 'Editing an Embedded answers (Cloze)';
+$string['layout'] = 'Layout';
+$string['layoutselectinline'] = 'Dropdown menu in-line in the text';
+$string['layouthorizontal'] = 'Horizontal row of radio-buttons';
+$string['layoutundefined'] = 'Undefined layout';
+$string['layoutvertical'] = 'Vertical column of radio buttons';
+$string['multianswer'] = 'Embedded answers (Cloze)';
 $string['nooptionsforsubquestion'] = 'Unable to get options for question part # $a->sub (question->id={$a->id})';
 $string['noquestions'] = 'The Cloze(multianswer) question \"<strong>$a</strong>\" does not contain any question ';
-$string['questionnotfound'] = 'Unable to find question of question part #$a';
 $string['qtypenotrecognized'] = 'questiontype $a not recognized';
+$string['questionnotfound'] = 'Unable to find question of question part #$a';
 $string['questionsmissing'] = 'No valid questions, create at least one question ';
+$string['questiondefinition'] = 'Question definition';
 $string['unknownquestiontypeofsubquestion'] = 'Unknown question type: $a->type of question part # $a->sub';
 ?>

diff --git a/question/type/multianswer/edit_multianswer_form.php b/question/type/multianswer/edit_multianswer_form.php
index 77fadcef8af5a96c03a4ad271ad89973143bf30f..6af136e4ea36d3fccf1d030d4760ef1f07dcb4e2 100644 (file)
--- a/question/type/multianswer/edit_multianswer_form.php
+++ b/question/type/multianswer/edit_multianswer_form.php
@@ -57,7 +57,7 @@ class question_edit_multianswer_form extends question_edit_form {
             $mform->addElement('header', 'subhdr', get_string('questionno', 'quiz',
                  '{#'.$sub.'}').' '.$question_type_names[$this->questiondisplay->options->questions[$sub]->qtype]);
 
-            $mform->addElement('static', 'sub_'.$sub."_".'questiontext', "subquestiontext",array('cols'=>60, 'rows'=>3));
+            $mform->addElement('static', 'sub_'.$sub."_".'questiontext', get_string('questiondefinition','qtype_multianswer'),array('cols'=>60, 'rows'=>3));
 
             if (isset ( $this->questiondisplay->options->questions[$sub]->questiontext)) {
                 $mform->setDefault('sub_'.$sub."_".'questiontext', $this->questiondisplay->options->questions[$sub]->questiontext);
@@ -67,7 +67,7 @@ class question_edit_multianswer_form extends question_edit_form {
             $mform->setDefault('sub_'.$sub."_".'defaultgrade',$this->questiondisplay->options->questions[$sub]->defaultgrade);
 
                 if ($this->questiondisplay->options->questions[$sub]->qtype =='multichoice'   ) {
-                    $mform->addElement('static', 'sub_'.$sub."_".'layout', get_string('layout', 'quiz'),array('cols'=>60, 'rows'=>1)) ;//, $gradeoptions);
+                    $mform->addElement('static', 'sub_'.$sub."_".'layout', get_string('layout', 'qtype_multianswer'),array('cols'=>60, 'rows'=>1)) ;//, $gradeoptions);
                 }
             foreach ($this->questiondisplay->options->questions[$sub]->answer as $key =>$ans) {
 
@@ -155,16 +155,16 @@ class question_edit_multianswer_form extends question_edit_form {
                         $default_values[$prefix.'layout']  = $subquestion->layout ;
                         switch ($subquestion->layout) {
                             case '0':
-                                $default_values[$prefix.'layout']= get_string('selectelement', 'qtype_multianswer');
+                                $default_values[$prefix.'layout']= get_string('layoutselectinline', 'qtype_multianswer');
                                 break;
                             case '1':
-                                $default_values[$prefix.'layout']= get_string('verticallayout', 'qtype_multianswer');
+                                $default_values[$prefix.'layout']= get_string('layoutvertical', 'qtype_multianswer');
                                 break;                         
                             case '2':
-                                $default_values[$prefix.'layout']= get_string('horizontallayout', 'qtype_multianswer');
+                                $default_values[$prefix.'layout']= get_string('layouthorizontal', 'qtype_multianswer');
                                 break;
                             default:
-                                $default_values[$prefix.'layout']= get_string('unknownlayout', 'qtype_multianswer');
+                                $default_values[$prefix.'layout']= get_string('layoutundefined', 'qtype_multianswer');
                         } 
                     }
                     foreach ($subquestion->answer as $key=>$answer) {
@@ -185,7 +185,7 @@ class question_edit_multianswer_form extends question_edit_form {
                             }
                         }
 
-                        $default_values[$prefix.'answer['.$key.']']  = $answer;
+                        $default_values[$prefix.'answer['.$key.']']  = htmlspecialchars ($answer);
                     }
                     if ($answercount == 0) {
                         if ($subquestion->qtype == 'multichoice' ) {
@@ -199,7 +199,7 @@ class question_edit_multianswer_form extends question_edit_form {
                     }
                     foreach ($subquestion->feedback as $key=>$answer) {
 
-                        $default_values[$prefix.'feedback['.$key.']']  = $answer;
+                        $default_values[$prefix.'feedback['.$key.']']  = htmlspecialchars ($answer);
                     }
                        foreach ( $subquestion->fraction as $key=>$answer) {
                         $default_values[$prefix.'fraction['.$key.']']  = $answer;