mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-45336 qtype_numerical: use own strings instead of mod_quiz

Browse Source 
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
This commit is contained in:
Marina Glancy 2014-09-18 14:35:03 +08:00 committed by Eloy Lafuente (stronk7)
parent 5a0221f7c0
commit 8766d1981c
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/quiz/lang/en/deprecated.txt Normal file
View File

@ -0,0 +1,3 @@
invalidnumericanswer,mod_quiz
multiplier,mod_quiz
invalidnumerictolerance,mod_quiz

9
mod/quiz/lang/en/quiz.php
View File

@ -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';

0
question/type/missingtype/lang/en/deprecated.txt Normal file
View File

4
question/type/numerical/edit_numerical_form.php
View File

@ -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;
}

4
question/type/numerical/questiontype.php
View File

@ -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)) {