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

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

Browse Source
This commit is contained in:
Dan Poltawski
2012-06-12 17:38:25 +08:00
parent 93de786561 4c7f377d9b
commit 8409bd51f4
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/edit.php
+3 -7
View File
@@ -145,10 +145,6 @@ $quizhasattempts = quiz_has_attempts($quiz->id);
$PAGE->set_url($thispageurl);
$pagetitle = get_string('editingquiz', 'quiz');
if ($quiz_reordertool) {
$pagetitle = get_string('orderingquiz', 'quiz');
}
// Get the course object and related bits.
$course = $DB->get_record('course', array('id' => $quiz->course));
if (!$course) {
@@ -412,7 +408,7 @@ $PAGE->requires->skip_link_to('questionbank',
get_string('skipto', 'access', get_string('questionbank', 'question')));
$PAGE->requires->skip_link_to('quizcontentsblock',
get_string('skipto', 'access', get_string('questionsinthisquiz', 'quiz')));
$PAGE->set_title($pagetitle);
$PAGE->set_title(get_string('editingquizx', 'quiz', format_string($quiz->name)));
$PAGE->set_heading($course->fullname);
$node = $PAGE->settingsnav->find('mod_quiz_edit', navigation_node::TYPE_SETTING);
if ($node) {
@@ -498,10 +494,10 @@ if ($quiz_reordertool) {
}
if ($quiz_reordertool) {
echo $OUTPUT->heading_with_help(get_string('orderingquiz', 'quiz') . ': ' . $quiz->name,
echo $OUTPUT->heading_with_help(get_string('orderingquizx', 'quiz', format_string($quiz->name)),
'orderandpaging', 'quiz');
} else {
echo $OUTPUT->heading(get_string('editingquiz', 'quiz') . ': ' . $quiz->name, 2);
echo $OUTPUT->heading(get_string('editingquizx', 'quiz', format_string($quiz->name)), 2);
echo $OUTPUT->help_icon('editingquiz', 'quiz', get_string('basicideasofquiz', 'quiz'));
}
quiz_print_status_bar($quiz);
mod/quiz/lang/en/quiz.php
+2
View File
@@ -246,6 +246,7 @@ $string['editingquiz_help'] = 'When creating a quiz, the main concepts are:
* The question bank, which stores copies of all questions organised into categories
* Random questions - A student gets different questions each time they attempt the quiz and different students can get different questions';
$string['editingquiz_link'] = 'mod/quiz/edit';
$string['editingquizx'] = 'Editing quiz: {$a}';
$string['editoverride'] = 'Edit override';
$string['editqcats'] = 'Edit questions categories';
$string['editquestions'] = 'Edit questions';
@@ -514,6 +515,7 @@ To add page breaks after particular questions, tick the checkboxes next to the q
To arrange the questions over a number of pages, click the Repaginate button and select the desired number of questions per page.';
$string['orderingquiz'] = 'Order and paging';
$string['orderingquizx'] = 'Order and paging: {$a}';
$string['outof'] = '{$a->grade} out of a maximum of {$a->maxgrade}';
$string['outofpercent'] = '{$a->grade} out of a maximum of {$a->maxgrade} ({$a->percent}%)';
$string['outofshort'] = '{$a->grade}/{$a->maxgrade}';