Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle
  • Loading branch information
Aparup Banerjee committed Mar 5, 2013
2 parents 44cfa89 + b9509a1 commit da33f68
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions mod/assignment/lang/en/assignment.php
Expand Up @@ -58,6 +58,7 @@
$string['cannotdeletefiles'] = 'An error occurred and files could not be deleted'; $string['cannotdeletefiles'] = 'An error occurred and files could not be deleted';
$string['cannotviewassignment'] = 'You can not view this assignment'; $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['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['comment'] = 'Comment';
$string['commentinline'] = 'Comment inline'; $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.'; $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.';
Expand Down Expand Up @@ -105,6 +106,7 @@
$string['feedbackupdated'] = 'Submissions feedback updated for {$a} people'; $string['feedbackupdated'] = 'Submissions feedback updated for {$a} people';
$string['finalize'] = 'Prevent submission updates'; $string['finalize'] = 'Prevent submission updates';
$string['finalizeerror'] = 'An error occurred and that submission could not be finalised'; $string['finalizeerror'] = 'An error occurred and that submission could not be finalised';
$string['futureaassignment'] = 'This assignment is not yet available.';
$string['graded'] = 'Graded'; $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['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'; $string['guestnoupload'] = 'Sorry, guests are not allowed to upload';
Expand Down
7 changes: 5 additions & 2 deletions mod/assignment/type/upload/assignment.class.php
Expand Up @@ -184,8 +184,11 @@ function view_final_submission() {
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
} else if (!$this->isopen()) { } 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)) { } else if ($this->drafts_tracked() and $state = $this->is_finalized($submission)) {
if ($state == ASSIGNMENT_STATUS_SUBMITTED) { if ($state == ASSIGNMENT_STATUS_SUBMITTED) {
echo $OUTPUT->heading(get_string('submitedformarking','assignment'), 3); echo $OUTPUT->heading(get_string('submitedformarking','assignment'), 3);
Expand Down

0 comments on commit da33f68

Please sign in to comment.