Permalink
Browse files

MDL-9519 - incorrectuse of language strings in quiz.

  • Loading branch information...
tjhunt
tjhunt committed Aug 6, 2007
1 parent caa413e commit 1221d87de8c34473a3ca214bd6509dd73042b2de
Showing with 25 additions and 9 deletions.
  1. +1 −1 mod/quiz/config.html
  2. +20 −4 mod/quiz/locallib.php
  3. +2 −2 mod/quiz/mod_form.php
  4. +2 −2 mod/quiz/view.php
View
@@ -224,7 +224,7 @@
<td align="right"><b><?php print_string("grademethod", "quiz") ?>:</b></td>
<td>
<?php
- choose_from_menu ($QUIZ_GRADE_METHOD, "grademethod", $form->grademethod, "", "", "");
+ choose_from_menu (quiz_get_grading_options(), "grademethod", $form->grademethod, "", "", "");
helpbutton("grademethod", get_string("grademethod","quiz"), "quiz");
?>
</td>
View
@@ -33,10 +33,6 @@
define("QUIZ_GRADEAVERAGE", "2");
define("QUIZ_ATTEMPTFIRST", "3");
define("QUIZ_ATTEMPTLAST", "4");
-$QUIZ_GRADE_METHOD = array ( QUIZ_GRADEHIGHEST => get_string("gradehighest", "quiz"),
- QUIZ_GRADEAVERAGE => get_string("gradeaverage", "quiz"),
- QUIZ_ATTEMPTFIRST => get_string("attemptfirst", "quiz"),
- QUIZ_ATTEMPTLAST => get_string("attemptlast", "quiz"));
/**#@-*/
@@ -533,6 +529,26 @@ function quiz_calculate_best_attempt($quiz, $attempts) {
}
}
+/**
+ * @return the options for calculating the quiz grade from the individual attempt grades.
+ */
+function quiz_get_grading_options() {
+ return array (
+ QUIZ_GRADEHIGHEST => get_string('gradehighest', 'quiz'),
+ QUIZ_GRADEAVERAGE => get_string('gradeaverage', 'quiz'),
+ QUIZ_ATTEMPTFIRST => get_string('attemptfirst', 'quiz'),
+ QUIZ_ATTEMPTLAST => get_string('attemptlast', 'quiz'));
+}
+
+/**
+ * @param int $option one of the values QUIZ_GRADEHIGHEST, QUIZ_GRADEAVERAGE, QUIZ_ATTEMPTFIRST or QUIZ_ATTEMPTLAST.
+ * @return the lang string for that option.
+ */
+function quiz_get_grading_option_name($option) {
+ $strings = quiz_get_grading_options();
+ return $strings[$option];
+}
+
/// OTHER QUIZ FUNCTIONS ////////////////////////////////////////////////////
View
@@ -8,7 +8,7 @@ class mod_quiz_mod_form extends moodleform_mod {
function definition() {
- global $COURSE, $CFG, $QUIZ_GRADE_METHOD;
+ global $COURSE, $CFG;
$mform =& $this->_form;
//-------------------------------------------------------------------------------
@@ -117,7 +117,7 @@ function definition() {
//-------------------------------------------------------------------------------
$mform->addElement('header', 'gradeshdr', get_string('grades', 'grades'));
- $mform->addElement('select', 'grademethod', get_string("grademethod", "quiz"), $QUIZ_GRADE_METHOD);
+ $mform->addElement('select', 'grademethod', get_string("grademethod", "quiz"), quiz_get_grading_options());
$mform->setHelpButton('grademethod', array("grademethod", get_string("grademethod","quiz"), "quiz"));
$mform->setAdvanced('grademethod', $CFG->quiz_fix_grademethod);
$mform->setDefault('grademethod', $CFG->quiz_grademethod);
View
@@ -97,7 +97,7 @@
echo "<p>".get_string("attemptsallowed", "quiz").": $quiz->attempts</p>";
}
if ($quiz->attempts != 1) {
- echo "<p>".get_string("grademethod", "quiz").": ".$QUIZ_GRADE_METHOD[$quiz->grademethod]."</p>";
+ echo "<p>".get_string("grademethod", "quiz").": ".quiz_get_grading_option_name($quiz->grademethod)."</p>";
}
// Print information about timings.
@@ -289,7 +289,7 @@
if ($overallstats) {
if ($available && $moreattempts) {
$a = new stdClass;
- $a->method = $QUIZ_GRADE_METHOD[$quiz->grademethod];
+ $a->method = quiz_get_grading_option_name($quiz->grademethod);
$a->mygrade = $mygrade;
$a->quizgrade = $quiz->grade;
print_heading(get_string('gradesofar', 'quiz', $a));

0 comments on commit 1221d87

Please sign in to comment.