Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)
mod/assign/gradingtable.php
mod/assign/lang/en/assign.php

index 70c2287..6703422 100644 (file)
@@ -260,11 +260,10 @@ class assign_grading_table extends table_sql implements renderable {
         // Submission status.
         if ($assignment->is_any_submission_plugin_enabled()) {
             $columns[] = 'status';
-            $headers[] = get_string('status');
+            $headers[] = get_string('status', 'assign');
         } else if ($this->assignment->get_instance()->markingworkflow) {
             $columns[] = 'workflowstatus';
-            $headers[] = get_string('status');
-
+            $headers[] = get_string('status', 'assign');
         }
 
         // Team submission columns.
index 34c193e..b214864 100644 (file)
@@ -308,6 +308,7 @@ $string['setmarkingworkflowstateforlog'] = 'Set marking workflow state : (id={$a
 $string['setmarkerallocationforlog'] = 'Set marking allocation : (id={$a->id}, fullname={$a->fullname}, marker={$a->marker}). ';
 $string['settings'] = 'Assignment settings';
 $string['showrecentsubmissions'] = 'Show recent submissions';
+$string['status'] = 'Status';
 $string['submissioncopiedtext'] = 'You have made a copy of your previous
 assignment submission for \'{$a->assignment}\'