Skip to content
Browse files

Merge branch 'MDL-30481_m24' of git:// into …

  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Mar 5, 2013
2 parents 4690255 + e6e074c commit a05b00c6867f3d6ee8f04c356a119f8616b88f5c
Showing with 7 additions and 2 deletions.
  1. +2 −0 mod/assignment/lang/en/assignment.php
  2. +5 −2 mod/assignment/type/upload/assignment.class.php
@@ -58,6 +58,7 @@
$string['cannotdeletefiles'] = 'An error occurred and files could not be deleted';
$string['cannotviewassignment'] = 'You can not view this assignment';
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
$string['closedassignment'] = 'The submission date for this assignment has been closed.';
$string['comment'] = 'Comment';
$string['commentinline'] = 'Comment inline';
$string['commentinline_help'] = 'If enabled, the submission text will be copied into the feedback comment field during grading, making it easier to comment inline (using a different colour, perhaps) or to edit the original text.';
@@ -105,6 +106,7 @@
$string['feedbackupdated'] = 'Submissions feedback updated for {$a} people';
$string['finalize'] = 'Prevent submission updates';
$string['finalizeerror'] = 'An error occurred and that submission could not be finalised';
$string['futureaassignment'] = 'This assignment is not yet available.';
$string['graded'] = 'Graded';
$string['guestnosubmit'] = 'Sorry, guests are not allowed to submit an assignment. You have to log in/ register before you can submit your answer.';
$string['guestnoupload'] = 'Sorry, guests are not allowed to upload';
@@ -184,8 +184,11 @@ function view_final_submission() {
echo '</form>';
echo '</div>';
} else if (!$this->isopen()) {
echo $OUTPUT->heading(get_string('nomoresubmissions','assignment'), 3);
if ($this->assignment->timeavailable < time()) {
echo $OUTPUT->heading(get_string('closedassignment','assignment'), 3);
} else {
echo $OUTPUT->heading(get_string('futureaassignment','assignment'), 3);
} else if ($this->drafts_tracked() and $state = $this->is_finalized($submission)) {
echo $OUTPUT->heading(get_string('submitedformarking','assignment'), 3);

0 comments on commit a05b00c

Please sign in to comment.
You can’t perform that action at this time.