Merge branch 'MDL-44665_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

This commit is contained in:
Marina Glancy
2014-03-25 14:29:49 +08:00
2 changed files with 13 additions and 2 deletions
+5
View File
@@ -553,7 +553,12 @@ $string['overrides'] = 'Overrides';
$string['overrideuser'] = 'Override user';
$string['overrideusereventname'] = '{$a->quiz} - Override';
$string['page-mod-quiz-x'] = 'Any quiz module page';
$string['page-mod-quiz-attempt'] = 'Attempt quiz page';
$string['page-mod-quiz-edit'] = 'Edit quiz page';
$string['page-mod-quiz-report'] = 'Any quiz report page';
$string['page-mod-quiz-review'] = 'Review quiz attempt page';
$string['page-mod-quiz-summary'] = 'Quiz attempt summary page';
$string['page-mod-quiz-view'] = 'Quiz information page';
$string['pagesize'] = 'Page size';
$string['parent'] = 'Parent';
$string['parentcategory'] = 'Parent category';
+8 -2
View File
@@ -1756,8 +1756,14 @@ function quiz_question_pluginfile($course, $context, $component,
*/
function quiz_page_type_list($pagetype, $parentcontext, $currentcontext) {
$module_pagetype = array(
'mod-quiz-*'=>get_string('page-mod-quiz-x', 'quiz'),
'mod-quiz-edit'=>get_string('page-mod-quiz-edit', 'quiz'));
'mod-quiz-*' => get_string('page-mod-quiz-x', 'quiz'),
'mod-quiz-view' => get_string('page-mod-quiz-view', 'quiz'),
'mod-quiz-attempt' => get_string('page-mod-quiz-attempt', 'quiz'),
'mod-quiz-summary' => get_string('page-mod-quiz-summary', 'quiz'),
'mod-quiz-review' => get_string('page-mod-quiz-review', 'quiz'),
'mod-quiz-edit' => get_string('page-mod-quiz-edit', 'quiz'),
'mod-quiz-report' => get_string('page-mod-quiz-report', 'quiz'),
);
return $module_pagetype;
}