MDL-12294 Merged language fixes from stable

diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
index 7d1e1fc11d0c89f518d0fab2d06354cea0d47109..0c718fabd05c3c90587d74274461b8941c4161b3 100644 (file)
--- 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 3a1e08815225d23479e2c511ca31aafc6eb6c20a..5ae74647a2da7f364aeff4e78758b29562c527c8 100644 (file)
--- 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 c3d9c53cd22a04d107666fb47ab67090502e145f..2fd11f7632d761d1f7e25f31842e7992f3385cca 100755 (executable)
--- 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 4e8ca4c6a72c1a605b5f0e46d7140c6e83925c03..29dcdcc4e0c9330973be96ffd2d8fd830d987008 100755 (executable)
--- 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 95ade857494ea176f2149441c5d3dc0d76b0ade7..2f473d3e75da8554e2ea6c77bba85a1ec632ccc6 100755 (executable)
--- 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 d28bc37b4ab05b196d8181b3a0507a4cf1e51983..0f505780661fe7a113cc1f62f1aeac86e95075bb 100755 (executable)
--- 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 30c2a49c123b28c4c6a07a3ed086aba429016a81..36d42847ee4778bbefb6a7a3eb991f4120de242b 100755 (executable)
--- 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 efddd1860bc47b14ab11e0bac890f4d5229100cd..7bf60f6106799dc81e45d6aa5b28f895171aed1b 100644 (file)
--- 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 004599f5b73b059ec39df65af2d06d2dea98d1a8..db1f0b34472fced68aa3628c3d6d986ecc6eb00b 100644 (file)
--- 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<br /> 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 bf6b146958b8c471d057d776b77afd6193b34857..bafcba78fe2ebac5b48481f2bf2731bd0906e006 100644 (file)
--- 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';