L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-47494 gapselect: Merge branch 'diff_2_2' changes for Moodle 2.2+

Browse Source 
Conflicts:
	lang/en/qtype_gapselect.php
This commit is contained in:
Jamie Pratt
2012-02-04 18:27:11 +07:00
parent 5283ee02c1 f37cb12ed0
commit 533a0aa2be
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/gapselect/lang/en/qtype_gapselect.php
+6 -5
View File
@@ -23,20 +23,21 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['addinggapselect'] = 'Adding a select missing words question';
$string['addmorechoiceblanks'] = 'Blanks for {no} more choices';
$string['answer'] = 'Answer';
$string['choices'] = 'Choices';
$string['choicex'] = 'Choice {no}';
$string['correctansweris'] = 'The correct answer is: {$a}';
$string['editinggapselect'] = 'Editing a select missing words question';
$string['errorblankchoice'] = 'Please check the Choices: Choice {$a} is empty.';
$string['errormissingchoice'] = 'Please check the Question text: {$a} was not found in Choices! Only the choice numbers that exist in choices are allowed to be used a place holders.';
$string['errornoslots'] = 'The question text must contain placeholders like [[1]] to show where the missing words go.';
$string['errorquestiontextblank'] = 'You must enter some question text.';
$string['gapselect'] = 'Select missing words';
$string['gapselect_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.';
$string['gapselectsummary'] = 'Missing words in some text are filled in using dropdown menus.';
$string['group'] = 'Group';
$string['pleaseputananswerineachbox'] = 'Please put an answer in each box.';
$string['pluginname'] = 'Select missing words';
$string['pluginname_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.';
$string['pluginname_link'] = 'question/type/gapselect';
$string['pluginnameadding'] = 'Adding a select missing words question';
$string['pluginnameediting'] = 'Editing a select missing words question';
$string['pluginnamesummary'] = 'Missing words in some text are filled in using dropdown menus.';
$string['shuffle'] = 'Shuffle';
question/type/gapselect/simpletest/testquestiontype.php
+2 -3
View File
@@ -180,11 +180,11 @@ class qtype_gapselect_test extends UnitTestCase {
<text>Gamma</text>
<group>1</group>
</selectoption>
<hint>
<hint format="moodle_auto_format">
<text>Try again.</text>
<shownumcorrect />
</hint>
<hint>
<hint format="moodle_auto_format">
<text>These are the first three letters of the Greek alphabet.</text>
<shownumcorrect />
<clearwrong />
@@ -228,7 +228,6 @@ class qtype_gapselect_test extends UnitTestCase {
'format' => FORMAT_MOODLE, 'files' => array()));
$expectedq->hintshownumcorrect = array(true, true);
$expectedq->hintclearwrong = array(false, true);
$this->assert(new CheckSpecifiedFieldsExpectation($expectedq), $q);
$this->assertEqual($expectedq->hint, $q->hint);
}