Skip to content

Commit

Permalink
Merge branch 'MDL-44665' of git://github.com/timhunt/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
marinaglancy committed Mar 25, 2014
2 parents 3f4a4da + f38965d commit 2bcb6db
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
5 changes: 5 additions & 0 deletions mod/quiz/lang/en/quiz.php
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,12 @@
$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';
Expand Down
10 changes: 8 additions & 2 deletions mod/quiz/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1758,8 +1758,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;
}

Expand Down

0 comments on commit 2bcb6db

Please sign in to comment.