mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 02:40:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Marina Glancy 2013-07-09 18:06:33 +10:00
commit 73118a2687
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/assign/gradingtable.php
View 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.

1
mod/assign/lang/en/assign.php
View 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}\'