Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2017-12-18 23:57:27 +01:00
commit 22c6affdef
2 changed files with 3 additions and 2 deletions

View file

@ -24,6 +24,7 @@
$string['activityoverview'] = 'You have assignments that need attention';
$string['addsubmission'] = 'Add submission';
$string['addsubmission_help'] = 'You have not made a submission yet';
$string['addattempt'] = 'Allow another attempt';
$string['addnewattempt'] = 'Add a new attempt';
$string['addnewattempt_help'] = 'This will create a new blank submission for you to work on.';
@ -162,7 +163,7 @@ $string['editingpreviousfeedbackwarning'] = 'You are editing the feedback for a
$string['editoverride'] = 'Edit override';
$string['editsubmission'] = 'Edit submission';
$string['editsubmissionother'] = 'Edit submission for {$a}';
$string['editsubmission_help'] = 'Make changes to your submission';
$string['editsubmission_help'] = 'You can still make changes to your submission';
$string['editingstatus'] = 'Editing status';
$string['editaction'] = 'Actions...';
$string['enabled'] = 'Enabled';

View file

@ -925,7 +925,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$o .= $this->output->single_button(new moodle_url('/mod/assign/view.php', $urlparams),
get_string('addsubmission', 'assign'), 'get');
$o .= $this->output->box_start('boxaligncenter submithelp');
$o .= get_string('editsubmission_help', 'assign');
$o .= get_string('addsubmission_help', 'assign');
$o .= $this->output->box_end();
$o .= $this->output->box_end();
} else if ($submission->status == ASSIGN_SUBMISSION_STATUS_REOPENED) {