From 3674c3985ee4f938c7501f1597823bc863ee57f8 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 26 Feb 2008 08:02:16 +0000 Subject: [PATCH] MDL-12294 Merged language fixes from stable --- grade/edit/tree/calculation.php | 2 +- grade/edit/tree/item_form.php | 2 +- grade/export/ods/grade_export_ods.php | 2 +- grade/export/txt/grade_export_txt.php | 2 +- grade/export/xls/grade_export_xls.php | 2 +- grade/export/xml/grade_export_xml.php | 2 +- grade/import/csv/index.php | 2 +- grade/import/xml/lib.php | 2 +- lang/en_utf8/grades.php | 3 +++ lang/en_utf8/moodle.php | 1 + 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php index 7d1e1fc11d..0c718fabd0 100644 --- a/grade/edit/tree/calculation.php +++ b/grade/edit/tree/calculation.php @@ -52,7 +52,7 @@ if (!$grade_item = grade_item::fetch(array('id'=>$id, 'courseid'=>$course->id))) // module items and items without grade can not have calculation if (($grade_item->is_external_item() and !$grade_item->is_outcome_item()) or ($grade_item->gradetype != GRADE_TYPE_VALUE and $grade_item->gradetype != GRADE_TYPE_SCALE)) { - redirect($returnurl, get_string('errornocalculationallowed', 'grades')); //TODO: localize + redirect($returnurl, get_string('errornocalculationallowed', 'grades')); } $mform = new edit_calculation_form(null, array('gpr'=>$gpr, 'itemid' => $grade_item->id)); diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php index 3a1e088152..5ae74647a2 100644 --- a/grade/edit/tree/item_form.php +++ b/grade/edit/tree/item_form.php @@ -66,7 +66,7 @@ class edit_item_form extends moodleform { } } $mform->addElement('select', 'scaleid', get_string('scale'), $options); - $mform->setHelpButton('scaleid', array(false, get_string('scale', 'grades'), + $mform->setHelpButton('scaleid', array(false, get_string('scale'), false, true, false, get_string('scaleidhelp', 'grades', get_string('gradeitem', 'grades')))); $mform->disabledIf('scaleid', 'gradetype', 'noteq', GRADE_TYPE_SCALE); diff --git a/grade/export/ods/grade_export_ods.php b/grade/export/ods/grade_export_ods.php index c3d9c53cd2..2fd11f7632 100755 --- a/grade/export/ods/grade_export_ods.php +++ b/grade/export/ods/grade_export_ods.php @@ -37,7 +37,7 @@ class grade_export_ods extends grade_export { $export_tracking = $this->track_exports(); - $strgrades = get_string('grades', 'grades'); + $strgrades = get_string('grades'); /// Calculate file name $downloadfilename = clean_filename("{$this->course->shortname} $strgrades.ods"); diff --git a/grade/export/txt/grade_export_txt.php b/grade/export/txt/grade_export_txt.php index 4e8ca4c6a7..29dcdcc4e0 100755 --- a/grade/export/txt/grade_export_txt.php +++ b/grade/export/txt/grade_export_txt.php @@ -53,7 +53,7 @@ class grade_export_txt extends grade_export { $export_tracking = $this->track_exports(); - $strgrades = get_string('grades', 'grade'); + $strgrades = get_string('grades'); switch ($this->separator) { case 'comma': diff --git a/grade/export/xls/grade_export_xls.php b/grade/export/xls/grade_export_xls.php index 95ade85749..2f473d3e75 100755 --- a/grade/export/xls/grade_export_xls.php +++ b/grade/export/xls/grade_export_xls.php @@ -38,7 +38,7 @@ class grade_export_xls extends grade_export { $export_tracking = $this->track_exports(); - $strgrades = get_string('grades', 'grade'); + $strgrades = get_string('grades'); /// Calculate file name $downloadfilename = clean_filename("{$this->course->shortname} $strgrades.xls"); diff --git a/grade/export/xml/grade_export_xml.php b/grade/export/xml/grade_export_xml.php index d28bc37b4a..0f50578066 100755 --- a/grade/export/xml/grade_export_xml.php +++ b/grade/export/xml/grade_export_xml.php @@ -42,7 +42,7 @@ class grade_export_xml extends grade_export { $export_tracking = $this->track_exports(); - $strgrades = get_string('grades', 'grade'); + $strgrades = get_string('grades'); /// Calculate file name $downloadfilename = clean_filename("{$this->course->shortname} $strgrades.xml"); diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 30c2a49c12..36d42847ee 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -405,7 +405,7 @@ if ($formdata = $mform->get_data()) { // individual grade locked $status = false; import_cleanup($importcode); - notify(get_string('gradegradeslocked', 'grades')); + notify(get_string('gradelocked', 'grades')); break 2; } } diff --git a/grade/import/xml/lib.php b/grade/import/xml/lib.php index efddd1860b..7bf60f6106 100644 --- a/grade/import/xml/lib.php +++ b/grade/import/xml/lib.php @@ -78,7 +78,7 @@ function import_xml_grades($text, $course, &$error) { if ($grade_grade->is_locked()) { // individual grade locked, abort $status = false; - $error = get_string('gradegradeslocked', 'grades'); + $error = get_string('gradelocked', 'grades'); break; } } diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index 004599f5b7..db1f0b3447 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -151,6 +151,7 @@ $string['encoding'] = 'Encoding'; $string['errorgradevaluenonnumeric'] = 'Received non-numeric for low or high grade for'; $string['errorcalculationnoequal'] = 'Formula must start with equal sign (=1+2)'; $string['errorcalculationunknown'] = 'Invalid formula'; +$string['errornocalculationallowed'] = 'Calculations are not allowed for this item'; $string['errornocategorizedid'] = 'Could not get an uncategorized id!'; $string['errornocourse'] = 'Could not get course information'; $string['errorreprintheadersnonnumeric'] = 'Received non-numeric value for reprint-headers'; @@ -213,6 +214,7 @@ $string['gradeletter'] = 'Grade letter'; $string['gradeletters'] = 'Grade letters'; $string['gradeletterhelp'] = 'Grade letter Help'; $string['gradeletternote'] = 'To delete a grade letter just empty any of the
three text areas for that letter and click submit.'; +$string['gradelocked'] = 'Grade is locked'; $string['gradelong'] = '$a->grade / $a->max'; $string['grademax'] = 'Maximum grade'; $string['grademaxhelp'] = 'The maximum allowable grade for this grade item.'; @@ -276,6 +278,7 @@ $string['importskippedoutcome'] = 'An outcome with shortname \"$a\" already exis $string['importsuccess'] = 'Grade import success'; $string['importxml'] = 'Import XML'; $string['incorrectcourseid'] = 'Course ID was incorrect'; +$string['incorrectminmax'] = 'The minimum must be lower than the maximum'; $string['inherit'] = 'Inherit'; $string['item'] = 'Item'; $string['iteminfo'] = 'Item info'; diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php index bf6b146958..bafcba78fe 100644 --- a/lang/en_utf8/moodle.php +++ b/lang/en_utf8/moodle.php @@ -378,6 +378,7 @@ $string['deletedcourse'] = '$a has been completely deleted'; $string['deletednot'] = 'Could not delete $a !'; $string['deletelogs'] = 'Delete logs'; $string['deleteselected'] = 'Delete selected'; +$string['deleteselectedkey'] = 'Delete selected key'; $string['deletingcourse'] = 'Deleting $a'; $string['deletingexistingcoursedata'] = 'Deleting existing course data'; $string['deletingolddata'] = 'Deleting old data'; -- 2.39.5