Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-27956 Lesson - Fixed strings and readquestions scope

  • Loading branch information...
commit ba15c346b18ccf4a585bf7a367951056ace70230 1 parent 3552484
Rajesh Taneja authored
View
2  mod/lesson/format.php
@@ -453,7 +453,7 @@ function readdata($filename) {
return false;
}
- function readquestions($lines) {
+ protected function readquestions($lines) {
/// Parses an array of lines into an array of questions,
/// where each item is a question object as defined by
/// readquestion(). Questions are defined as anything
View
9 mod/lesson/lib.php
@@ -876,14 +876,7 @@ function lesson_get_import_export_formats($type) {
$provided = $format_class->provide_export();
}
if ($provided) {
- //TODO: do NOT rely on [[]] any more!!
- $formatname = get_string($fileformat, 'quiz');
- if ($formatname == "[[$fileformat]]") {
- $formatname = get_string($fileformat, 'qformat_'.$fileformat);
- if ($formatname == "[[$fileformat]]") {
- $formatname = $fileformat; // Just use the raw folder name
- }
- }
+ $formatname = get_string($fileformat, 'qformat_'.$fileformat);
$fileformatnames[$fileformat] = $formatname;
}
}
View
7 mod/quiz/lang/en/quiz.php
@@ -55,7 +55,6 @@
$string['aftereachquestion'] = 'After adding each question';
$string['afternquestions'] = 'After adding {$a} questions';
$string['age'] = 'age';
-$string['aiken'] = 'Aiken format';
$string['allattempts'] = 'All attempts';
$string['allinone'] = 'Unlimited';
$string['allowreview'] = 'Allow review';
@@ -104,8 +103,6 @@
$string['backtoquiz'] = 'Back to quiz editing';
$string['basicideasofquiz'] = 'The basic ideas of quiz-making';
$string['bestgrade'] = 'Best grade';
-$string['blackboard'] = 'Blackboard';
-$string['blackboard_six'] = 'Blackboard V6+';
$string['bothattempts'] = 'Show students with and without attempts';
$string['browsersecurity'] = 'Browser security';
$string['browsersecurity_help'] = 'If "Full screen pop-up with some JavaScript security" is selected,
@@ -286,7 +283,6 @@
$string['everynquestions'] = 'Every {$a} questions';
$string['everyquestion'] = 'Every question';
$string['everythingon'] = 'Everything on';
-$string['examview'] = 'Examview';
$string['export'] = 'Export';
$string['exportcategory'] = 'export category';
$string['exporterror'] = 'An error occurred during export processing';
@@ -387,7 +383,6 @@
$string['layoutasshownwithpages'] = 'Page layout as shown. <small>(Automatic new page every {$a} questions.)</small>';
$string['layoutshuffledandpaged'] = 'Questions randomly shuffled with {$a} questions per page.';
$string['layoutshuffledsinglepage'] = 'Questions randomly shuffled, all on one page.';
-$string['learnwise'] = 'Learnwise format';
$string['link'] = 'Link';
$string['listitems'] = 'Listing of items in quiz';
$string['literal'] = 'Literal';
@@ -408,12 +403,10 @@
$string['minutes'] = 'Minutes';
$string['missingcorrectanswer'] = 'Correct answer must be specified';
$string['missingitemtypename'] = 'Missing name';
-$string['missingword'] = 'Missing word format';
$string['modulename'] = 'Quiz';
$string['modulename_help'] = 'The quiz module enables the teacher to design and set quizzes consisting of multiple choice, true-false, matching and other question types. Each attempt is automatically marked, and the teacher can choose whether to give feedback and/or show correct answers.';
$string['modulenameplural'] = 'Quizzes';
$string['moveselectedonpage'] = 'Move selected questions to page: {$a}';
-$string['multianswer'] = 'Embedded answers (cloze)';
$string['multichoice'] = 'Multiple choice';
$string['multipleanswers'] = 'Choose at least one answer.';
$string['multiplier'] = 'Multiplier';
View
1  question/format/xml/format.php
@@ -26,7 +26,6 @@
defined('MOODLE_INTERNAL') || die();
-require_once($CFG->dirroot . '/question/format.php');
require_once($CFG->libdir . '/xmlize.php');
View
1  question/format/xml/simpletest/testxmlformat.php
@@ -27,6 +27,7 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/questionlib.php');
+require_once($CFG->dirroot . '/question/format.php');
require_once($CFG->dirroot . '/question/format/xml/format.php');
Please sign in to comment.
Something went wrong with that request. Please try again.