Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle

This commit is contained in:
Aparup Banerjee 2011-10-24 11:36:07 +08:00
commit c11ccbfd8b
2 changed files with 6 additions and 1 deletions

View File

@ -109,9 +109,13 @@ class qtype_multichoice_edit_form extends question_edit_form {
foreach ($answers as $key => $answer) {
//check no of choices
$trimmedanswer = trim($answer['text']);
if (empty($trimmedanswer)) {
$fraction = (float) $data['fraction'][$key];
if (empty($trimmedanswer) && empty($fraction)) {
continue;
}
if (empty($trimmedanswer)) {
$errors['fraction['.$key.']'] = get_string('errgradesetanswerblank', 'qtype_multichoice');
}
$answercount++;

View File

@ -41,6 +41,7 @@ $string['clozeaid'] = 'Enter missing word';
$string['correctansweris'] = 'The correct answer is: {$a}.';
$string['correctfeedback'] = 'For any correct response';
$string['editingmultichoice'] = 'Editing a Multiple choice question';
$string['errgradesetanswerblank'] = 'Grade set, but the Answer is blank';
$string['errfractionsaddwrong'] = 'The positive grades you have chosen do not add up to 100%<br />Instead, they add up to {$a}%';
$string['errfractionsnomax'] = 'One of the choices should be 100%, so that it is<br />possible to get a full grade for this question.';
$string['feedback'] = 'Feedback';