diff --git a/lang/en/question.php b/lang/en/question.php index bacdbaebe4e..d1d29f64c16 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -23,6 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +$string['addcategory'] = 'Add category'; $string['adminreport'] = 'Report on possible problems in your question database.'; $string['availableq'] = 'Available?'; $string['badbase'] = 'Bad base before **: {$a}**'; @@ -52,7 +53,9 @@ $string['cannotwriteto'] = 'Cannot write exported questions to {$a}'; $string['categorycurrent'] = 'Current category'; $string['categorycurrentuse'] = 'Use this category'; $string['categorydoesnotexist'] = 'This category does not exist'; +$string['categoryinfo'] = 'Category info'; $string['categorymoveto'] = 'Save in category'; +$string['categorynamecantbeblank'] = 'The category name cannot be blank.'; $string['clicktoflag'] = 'Click to flag this question'; $string['clicktounflag'] = 'Click to un-flag this question'; $string['contexterror'] = 'You shouldn\'t have got here if you\'re not moving a category to another context.'; @@ -76,6 +79,8 @@ $string['cwrqpfsnoprob'] = 'No question categories in your site are affected by $string['defaultfor'] = 'Default for {$a}'; $string['defaultinfofor'] = 'The default category for questions shared in context \'{$a}\'.'; $string['deletecoursecategorywithquestions'] = 'There are questions in the question bank associated with this course category. If you proceed, they will be deleted. You may wish to move them first, using the question bank interface.'; +$string['deletequestioncheck'] = 'Are you absolutely sure you want to delete \'{$a}\'?'; +$string['deletequestionscheck'] = 'Are you absolutely sure you want to delete the following questions?

{$a}'; $string['disabled'] = 'Disabled'; $string['disterror'] = 'The distribution {$a} caused problems'; $string['donothing'] = 'Don\'t copy or move files or change links.'; @@ -91,6 +96,7 @@ Each category has a context which determines where the questions in the category Categories are also used for random questions, as questions are selected from a particular category.'; $string['editcategories_link'] = 'question/category'; +$string['editcategory'] = 'Edit category'; $string['editingcategory'] = 'Editing a category'; $string['editingquestion'] = 'Editing a question'; $string['editthiscategory'] = 'Edit this category'; @@ -218,6 +224,7 @@ $string['questiondoesnotexist'] = 'This question does not exist'; $string['questionname'] = 'Question name'; $string['questionno'] = 'Question {$a}'; $string['questionsaveerror'] = 'Errors occur during saving question - ({$a})'; +$string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These question will not be deleted from these quizzes but only from the category list.)'; $string['questionsmovedto'] = 'Questions still in use moved to "{$a}" in the parent course category.'; $string['questionsrescuedfrom'] = 'Questions saved from context {$a}.'; $string['questionsrescuedfrominfo'] = 'These questions (some of which may be hidden) were saved when context {$a} was deleted because they are still used by some quizzes or other activities.'; @@ -288,6 +295,7 @@ $string['howquestionsbehave'] = 'How questions behave'; $string['howquestionsbehave_help'] = 'Students can interact with the questions in the quiz in various different ways. For example, you may wish the students to enter an answer to each question and then submit the entire quiz, before anything is graded or they get any feedback. That would be \'Deferred feedback\' mode. Alternatively, you may wish for students to submit each question as they go along to get immediate feedback, and if they do not get it right immediately, have another try for fewer marks. That would be \'Interactive with multiple tries\' mode.'; $string['importfromcoursefiles'] = '... or choose a course file to import.'; $string['importfromupload'] = 'Select a file to upload ...'; +$string['includesubcategories'] = 'Also show questions from sub-categories'; $string['incorrect'] = 'Incorrect'; $string['incorrectfeedback'] = 'For any incorrect response'; $string['information'] = 'Information'; @@ -308,6 +316,7 @@ $string['notshown'] = 'Not shown'; $string['notyetanswered'] = 'Not yet answered'; $string['notyourpreview'] = 'This preview does not belong to you'; $string['options'] = 'Options'; +$string['parent'] = 'Parent'; $string['partiallycorrect'] = 'Partially correct'; $string['partiallycorrectfeedback'] = 'For any partially correct response'; $string['penaltyforeachincorrecttry'] = 'Penalty for each incorrect try'; @@ -322,6 +331,7 @@ $string['questionbehavioursorder'] = 'Question behaviours order'; $string['questionbehavioursorderexplained'] = 'Enter a comma separated list of behaviours in the order you want them to appear in dropdown menu'; $string['questionidmismatch'] = 'Question ids mismatch'; $string['questionname'] = 'Question name'; +$string['questions'] = 'Questions'; $string['questionx'] = 'Question {$a}'; $string['questiontext'] = 'Question text'; $string['requiresgrading'] = 'Requires grading'; @@ -332,8 +342,10 @@ $string['rightanswer'] = 'Right answer'; $string['saved'] = 'Saved: {$a}'; $string['saveflags'] = 'Save the state of the flags'; $string['settingsformultipletries'] = 'Settings for multiple tries'; +$string['showhidden'] = 'Also show old questions'; $string['showmarkandmax'] = 'Show mark and max'; $string['showmaxmarkonly'] = 'Show max mark only'; +$string['showquestiontext'] = 'Show question text in the question list'; $string['shown'] = 'Shown'; $string['shownumpartscorrect'] = 'Show the number of correct responses'; $string['specificfeedback'] = 'Specific feedback'; diff --git a/mod/quiz/addrandomform.php b/mod/quiz/addrandomform.php index 8619b19939f..6315af3bcc7 100644 --- a/mod/quiz/addrandomform.php +++ b/mod/quiz/addrandomform.php @@ -82,7 +82,7 @@ class quiz_add_random_form extends moodleform { $errors = parent::validation($fromform, $files); if (!empty($fromform['newcategory']) && trim($fromform['name']) == '') { - $errors['name'] = get_string('categorynamecantbeblank', 'quiz'); + $errors['name'] = get_string('categorynamecantbeblank', 'question'); } return $errors; diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 8fba64df023..df707edb0fd 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -1134,8 +1134,8 @@ class quiz_question_bank_view extends question_bank_view { echo '
'; echo "
"; echo html_writer::input_hidden_params($this->baseurl, array('recurse', 'showhidden', 'showquestiontext')); - $this->display_category_form_checkbox('recurse', get_string('recurse', 'quiz')); - $this->display_category_form_checkbox('showhidden', get_string('showhidden', 'quiz')); + $this->display_category_form_checkbox('recurse', get_string('includesubcategories', 'question')); + $this->display_category_form_checkbox('showhidden', get_string('showhidden', 'question')); echo '
'; } diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index 9963b6d23db..ca5a2fbb3d6 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -31,7 +31,6 @@ $string['adaptive_help'] = 'If enabled, multiple responses to a question are all $string['addaquestion'] = 'Add a question ...'; $string['addarandomquestion'] = 'Add a random question ...'; $string['addarandomquestion_help'] = 'When a random question is added, it results in a randomly-chosen question from the category being inserted into the quiz. This means that different students are likely to get a different selection of questions, and when a quiz allows multiple attempts then each attempt is likely to contain a new selection of questions.'; -$string['addcategory'] = 'Add category'; $string['adddescriptionlabel'] = 'Add description/label'; $string['addingquestion'] = 'Adding a question'; $string['addingquestions'] = 'This side of the page is where you manage your database of questions. Questions are stored in categories to help you keep them organised, and can be used by any quiz in your course or even other courses if you choose to \'publish\' them.

After you select or create a question category you will be able to create or edit questions. You can select any of these questions to add to your quiz over on the other side of this page.'; @@ -142,10 +141,8 @@ $string['categories'] = 'Categories'; $string['category'] = 'Category'; $string['categoryadded'] = 'The category \'{$a}\' was added'; $string['categorydeleted'] = 'The category \'{$a}\' was deleted'; -$string['categoryinfo'] = 'Category info'; $string['categorymove'] = 'The category \'{$a->name}\' contains {$a->count} questions (some of them may be old, hidden, questions that are still in use in some existing quizzes).
Please choose another category to move them to.'; $string['categorymoveto'] = 'Move them to this category'; -$string['categorynamecantbeblank'] = 'The category name cannot be blank.'; $string['categorynoedit'] = 'You do not have editing privileges in the category \'{$a}\'.'; $string['categoryupdated'] = 'The category was successfully updated'; $string['close'] = 'Close window'; @@ -231,8 +228,6 @@ $string['delay1st2nd'] = 'Enforced delay between 1st and 2nd attempts'; $string['delay1st2nd_help'] = 'If enabled, a student must wait for the specified time to elapse before being able to attempt the quiz a second time.'; $string['delay2'] = 'Time delay between later attempts'; $string['deleteattemptcheck'] = 'Are you absolutely sure you want to completely delete these attempts?'; -$string['deletequestioncheck'] = 'Are you absolutely sure you want to delete \'{$a}\'?'; -$string['deletequestionscheck'] = 'Are you absolutely sure you want to delete the following questions?

{$a}'; $string['deleteselected'] = 'Delete selected'; $string['deletingquestionattempts'] = 'Deleting question attempts'; $string['description'] = 'Description'; @@ -549,7 +544,6 @@ $string['questionorder'] = 'Question order'; $string['questions'] = 'Questions'; $string['questionsinclhidden'] = 'Questions (including hidden)'; $string['questionsinthisquiz'] = 'Questions in this quiz'; -$string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These question will not be deleted from these quizzes but only from the category list.)'; $string['questionsperpage'] = 'Questions per page'; $string['questionsperpageselected'] = 'Questions per page has been set so the paging is currently fixed. As a result, the paging controls have been disabled. You can change this in {$a}.'; $string['questionsperpagex'] = 'Questions per page: {$a}'; @@ -710,11 +704,9 @@ $string['showcorrectanswer'] = 'In feedback, show correct answers?'; $string['showdetailedmarks'] = 'Show mark details'; $string['showeachpage'] = 'Show one page at a time'; $string['showfeedback'] = 'After answering, show feedback?'; -$string['showhidden'] = 'Also show old questions'; $string['showinsecurepopup'] = 'Use a \'secure\' popup window for attempts'; $string['shownoattempts'] = 'Show students with no attempts'; $string['shownoattemptsonly'] = 'Show only students with no attempts'; -$string['showquestiontext'] = 'Show question text in the question list'; $string['showteacherattempts'] = 'Show teacher attempts'; $string['showuserpicture'] = 'Show the user\'s picture'; $string['showuserpicture_help'] = 'If enabled, the student\'s name and picture will be shown on-screen during the attempt, and on the review screen, making it easier to check that the student is logged in as themself in an invigilated (proctored) exam.'; diff --git a/question/category_form.php b/question/category_form.php index 4fd71ee9e19..ceb7c799486 100644 --- a/question/category_form.php +++ b/question/category_form.php @@ -44,7 +44,7 @@ class question_category_edit_form extends moodleform { $contexts = $this->_customdata['contexts']; $currentcat = $this->_customdata['currentcat']; -//-------------------------------------------------------------------------------- + $mform->addElement('header', 'categoryheader', get_string('addcategory', 'question')); $questioncategoryel = $mform->addElement('questioncategory', 'parent', get_string('parentcategory', 'question'), @@ -55,7 +55,7 @@ class question_category_edit_form extends moodleform { } $mform->addHelpButton('parent', 'parentcategory', 'question'); - $mform->addElement('text','name', get_string('name'),'maxlength="254" size="50"'); + $mform->addElement('text', 'name', get_string('name'),'maxlength="254" size="50"'); $mform->setDefault('name', ''); $mform->addRule('name', get_string('categorynamecantbeblank', 'question'), 'required', null, 'client'); $mform->setType('name', PARAM_MULTILANG); @@ -63,9 +63,9 @@ class question_category_edit_form extends moodleform { $mform->addElement('textarea', 'info', get_string('categoryinfo', 'question'), array('rows'=> '10', 'cols'=>'45')); $mform->setDefault('info', ''); $mform->setType('info', PARAM_MULTILANG); -//-------------------------------------------------------------------------------- + $this->add_action_buttons(false, get_string('addcategory', 'question')); -//-------------------------------------------------------------------------------- + $mform->addElement('hidden', 'id', 0); $mform->setType('id', PARAM_INT); } diff --git a/question/question.php b/question/question.php index ecd22a244ad..102d4bfd739 100644 --- a/question/question.php +++ b/question/question.php @@ -192,7 +192,7 @@ if ($id) { $PAGE->set_pagetype('question-type-' . $question->qtype); // Create the question editing form. -if ($wizardnow!=='' && !$movecontext){ +if ($wizardnow !== '' && !$movecontext){ $mform = $qtypeobj->next_wizard_form('question.php', $question, $wizardnow, $formeditable); } else { $mform = $qtypeobj->create_editing_form('question.php', $question, $category, $contexts, $formeditable); diff --git a/question/type/random/edit_random_form.php b/question/type/random/edit_random_form.php index 9b00a1ac80d..ae19cd372ff 100644 --- a/question/type/random/edit_random_form.php +++ b/question/type/random/edit_random_form.php @@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2007 Jamie Pratt me@jamiep.org * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class question_edit_random_form extends question_edit_form { +class qtype_random_edit_form extends question_edit_form { /** * Build the form definition. *