moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-33393' of git://github.com/timhunt/moodle

Browse source 
Conflicts:
	mod/quiz/lang/en/quiz.php
This commit is contained in:
Dan Poltawski 2012-06-12 17:00:09 +08:00
commit 203d255116
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/quiz/lang/en/quiz.php
View file

@ -522,9 +522,11 @@ $string['overallfeedback_help'] = 'Overall feedback is text that is shown after
$string['overdue'] = 'Overdue'; $string['overdue'] = 'Overdue';
$string['overduehandling'] = 'When time expires'; $string['overduehandling'] = 'When time expires';
$string['overduehandling_desc'] = 'What should happen by default if a student does not submit the quiz before time expires.'; $string['overduehandling_desc'] = 'What should happen by default if a student does not submit the quiz before time expires.';
$string['overduehandlingautosubmit'] = 'the attempt is submitted automatically'; $string['overduehandling_help'] = 'This setting controls what happens if the Student fails to submit their quiz attempt before time expires. If the student is actively working on the quiz at the time, then the countdown timer will always automatically submit the attempt for them, but if they have logged out, then this setting controls what happens.';
$string['overduehandlinggraceperiod'] = 'there is a grace period in which to submit the attempt, but not answer more questions'; $string['overduehandling_link'] = 'mod/quiz/timing';
$string['overduehandlingautoabandon'] = 'that is it. The attempt must be submitted before time expires, or it is not counted'; $string['overduehandlingautosubmit'] = 'Open attempts are submitted automatically';
$string['overduehandlinggraceperiod'] = 'There is a grace period when open attempts can be submitted, but no more questions answered';
$string['overduehandlingautoabandon'] = 'Attempts must be submitted before time expires, or they are not counted';
$string['overduemustbesubmittedby'] = 'This attempt is now overdue. It should already have been submitted. If you would like this quiz to be graded, you must submit it by {$a}. If you do not submit it by then, no marks from this attempt will be counted.'; $string['overduemustbesubmittedby'] = 'This attempt is now overdue. It should already have been submitted. If you would like this quiz to be graded, you must submit it by {$a}. If you do not submit it by then, no marks from this attempt will be counted.';
$string['override'] = 'Override'; $string['override'] = 'Override';
$string['overridedeletegroupsure'] = 'Are you sure you want to delete the override for group {$a}?'; $string['overridedeletegroupsure'] = 'Are you sure you want to delete the override for group {$a}?';
@ -609,6 +611,7 @@ $string['quiznavigation'] = 'Quiz navigation';
$string['quizopen'] = 'Open the quiz'; $string['quizopen'] = 'Open the quiz';
$string['quizopenclose'] = 'Open and close dates'; $string['quizopenclose'] = 'Open and close dates';
$string['quizopenclose_help'] = 'Students can only start their attempt(s) after the open time and they must complete their attempts before the close time.'; $string['quizopenclose_help'] = 'Students can only start their attempt(s) after the open time and they must complete their attempts before the close time.';
$string['quizopenclose_link'] = 'mod/quiz/timing';
$string['quizopened'] = 'This quiz is open.'; $string['quizopened'] = 'This quiz is open.';
$string['quizopenedon'] = 'This quiz opened at {$a}'; $string['quizopenedon'] = 'This quiz opened at {$a}';
$string['quizopens'] = 'Quiz opens'; $string['quizopens'] = 'Quiz opens';
@ -810,6 +813,7 @@ $string['timedelay'] = 'You are not allowed to do the quiz since you have not pa
$string['timeleft'] = 'Time left'; $string['timeleft'] = 'Time left';
$string['timelimit'] = 'Time limit'; $string['timelimit'] = 'Time limit';
$string['timelimit_help'] = 'If enabled, the time limit is stated on the initial quiz page and a countdown timer is displayed in the quiz navigation block.'; $string['timelimit_help'] = 'If enabled, the time limit is stated on the initial quiz page and a countdown timer is displayed in the quiz navigation block.';
$string['timelimit_link'] = 'mod/quiz/timing';
$string['timelimitexeeded'] = 'Sorry! Quiz time limit exceeded!'; $string['timelimitexeeded'] = 'Sorry! Quiz time limit exceeded!';
$string['timelimitmin'] = 'Time limit (minutes)'; $string['timelimitmin'] = 'Time limit (minutes)';
$string['timelimitsec'] = 'Time limit (seconds)'; $string['timelimitsec'] = 'Time limit (seconds)';

1
mod/quiz/mod_form.php
View file

@ -94,6 +94,7 @@ class mod_quiz_mod_form extends moodleform_mod {
// What to do with overdue attempts. // What to do with overdue attempts.
$mform->addElement('select', 'overduehandling', get_string('overduehandling', 'quiz'), $mform->addElement('select', 'overduehandling', get_string('overduehandling', 'quiz'),
quiz_get_overdue_handling_options()); quiz_get_overdue_handling_options());
$mform->addHelpButton('overduehandling', 'overduehandling', 'quiz');
$mform->setAdvanced('overduehandling', $quizconfig->overduehandling_adv); $mform->setAdvanced('overduehandling', $quizconfig->overduehandling_adv);
$mform->setDefault('overduehandling', $quizconfig->overduehandling); $mform->setDefault('overduehandling', $quizconfig->overduehandling);
// TODO Formslib does OR logic on disableif, and we need AND logic here. // TODO Formslib does OR logic on disableif, and we need AND logic here.