"MDL-14129, fix print_error"

diff --git a/grade/report/grader/ajax_callbacks.php b/grade/report/grader/ajax_callbacks.php
index c221628da9013a1c5711e9e3051f392870dda035..affca2d8e6908c09abf0e278f6bce287319b18f4 100644 (file)
--- a/grade/report/grader/ajax_callbacks.php
+++ b/grade/report/grader/ajax_callbacks.php
@@ -41,7 +41,7 @@ switch ($action) {
         if (!empty($userid) && !empty($itemid) && $newvalue !== false && !empty($type)) {
             // Save the grade or feedback
             if (!$grade_item = grade_item::fetch(array('id'=>$itemid, 'courseid'=>$courseid))) { // we must verify course id here!
-                print_error('Incorrect grade item id');
+                print_error('invalidgradeitmeid');
             }
             
             /**

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 2ad2d9d18ea6fab5c46e8d0764a61d2b3b0fd7ed..5487d67325202f15b11fb8e1ae3311fead7b0cb1 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -180,7 +180,7 @@ class grade_report_grader extends grade_report {
             }
 
             if (!$grade_item = grade_item::fetch(array('id'=>$itemid, 'courseid'=>$this->courseid))) { // we must verify course id here!
-                print_error('Incorrect grade item id');
+                print_error('invalidgradeitmeid');
             }
 
             // Pre-process grade

diff --git a/grade/report/index.php b/grade/report/index.php
index 2aa15701b94c3accca3acda76bdba4fe5dd643f4..1d316e5afcdca9217ddb951ce62d632123fe9fb3 100644 (file)
--- a/grade/report/index.php
+++ b/grade/report/index.php
@@ -43,7 +43,7 @@ if ($reports = get_list_of_plugins('grade/report', 'CVS')) {     // Get all inst
 }
 
 if (empty($reports)) {
-    print_error('No reports accessible', '', $CFG->wwwroot.'/course/view.php?id='.$course->id); // TODO: localize
+    print_error('noreports', 'debug', $CFG->wwwroot.'/course/view.php?id='.$course->id); // TODO: localize
 }
 
 if (!isset($USER->grade_last_report)) {

diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index 624a9035096d5a61cb851ddb9dc537fa9f430df1..0dfa1a03308b6d9084e46f5e9ad69ad6f0135850 100644 (file)
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -37,7 +37,7 @@ if (!$course = get_record('course', 'id', $courseid)) {
 require_login($course);
 
 if (!$user = get_complete_user_data('id', $userid)) {
-    print_error("Incorrect userid");
+    print_error('invaliduser');
 }
 
 $context     = get_context_instance(CONTEXT_COURSE, $course->id);

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index 64b09096b67500f353a51323ae2024ae0c94f48a..bd37f05dc6ae1b7dff164ff738d4201286645fc8 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -44,7 +44,7 @@ if (empty($userid)) {
 
 } else {
     if (!get_complete_user_data('id', $userid)) {
-    print_error("Incorrect userid");
+    print_error('invaliduser');
 }
 
 }