diff --git a/mod/quiz/lang/en/deprecated.txt b/mod/quiz/lang/en/deprecated.txt new file mode 100644 index 00000000000..af38b0e3d75 --- /dev/null +++ b/mod/quiz/lang/en/deprecated.txt @@ -0,0 +1,3 @@ +invalidnumericanswer,mod_quiz +multiplier,mod_quiz +invalidnumerictolerance,mod_quiz diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index 22d47845504..21c5ee7e749 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -419,8 +419,6 @@ $string['inprogress'] = 'In progress'; $string['introduction'] = 'Description'; $string['invalidattemptid'] = 'No such attempt ID exists'; $string['invalidcategory'] = 'Category ID is invalid'; -$string['invalidnumericanswer'] = 'One of the answers you entered was not a valid number.'; -$string['invalidnumerictolerance'] = 'One of the tolerances you entered was not a valid number.'; $string['invalidoverrideid'] = 'Invalid override id'; $string['invalidquestionid'] = 'Invalid question id'; $string['invalidquizid'] = 'Invalid quiz ID'; @@ -476,7 +474,6 @@ $string['modulenameplural'] = 'Quizzes'; $string['moveselectedonpage'] = 'Move selected questions to page: {$a}'; $string['multichoice'] = 'Multiple choice'; $string['multipleanswers'] = 'Choose at least one answer.'; -$string['multiplier'] = 'Multiplier'; $string['mustbesubmittedby'] = 'This attempt must be submitted by {$a}.'; $string['name'] = 'Name'; $string['navmethod'] = 'Navigation method'; @@ -903,3 +900,9 @@ $string['wronguse'] = 'You can not use this page like that'; $string['xhtml'] = 'XHTML'; $string['youneedtoenrol'] = 'You need to enrol in this course before you can attempt this quiz'; $string['yourfinalgradeis'] = 'Your final grade for this quiz is {$a}.'; + +// Deprecated since Moodle 2.8 + +$string['invalidnumericanswer'] = 'One of the answers you entered was not a valid number.'; +$string['invalidnumerictolerance'] = 'One of the tolerances you entered was not a valid number.'; +$string['multiplier'] = 'Multiplier'; diff --git a/question/type/missingtype/lang/en/deprecated.txt b/question/type/missingtype/lang/en/deprecated.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/question/type/numerical/edit_numerical_form.php b/question/type/numerical/edit_numerical_form.php index 1d895507d31..fd8eefdd612 100644 --- a/question/type/numerical/edit_numerical_form.php +++ b/question/type/numerical/edit_numerical_form.php @@ -185,9 +185,9 @@ class qtype_numerical_edit_form extends question_edit_form { */ protected function unit_group($mform) { $grouparray = array(); - $grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'), array('size'=>10)); + $grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'qtype_numerical'), array('size'=>10)); $grouparray[] = $mform->createElement('text', 'multiplier', - get_string('multiplier', 'quiz'), array('size'=>10)); + get_string('multiplier', 'qtype_numerical'), array('size'=>10)); return $grouparray; } diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php index f1b2a868b40..4f0628a25ee 100644 --- a/question/type/numerical/questiontype.php +++ b/question/type/numerical/questiontype.php @@ -191,7 +191,7 @@ class qtype_numerical extends question_type { $answer->answer = $this->apply_unit($answerdata, $units, !empty($question->unitsleft)); if ($answer->answer === false) { - $result->notice = get_string('invalidnumericanswer', 'quiz'); + $result->notice = get_string('invalidnumericanswer', 'qtype_numerical'); } } $answer->fraction = $question->fraction[$key]; @@ -212,7 +212,7 @@ class qtype_numerical extends question_type { $options->tolerance = $this->apply_unit($question->tolerance[$key], $units, !empty($question->unitsleft)); if ($options->tolerance === false) { - $result->notice = get_string('invalidnumerictolerance', 'quiz'); + $result->notice = get_string('invalidnumerictolerance', 'qtype_numerical'); } } if (isset($options->id)) {