Commit 30fdf368 authored by Lisa Seeto's avatar Lisa Seeto
Browse files

Bug 1809494: Change Page submitted to portfolio submitted



When submitting a collection to an external site e.g. Moodle
When viewing Mahara as a site admin

behatnotneeded

Change-Id: I9bcdbedb235c838e87e208b17eee6a71bf1674d8
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
parent 6c209a96
......@@ -93,8 +93,8 @@ $string['Views'] = 'Pages';
$string['portfolio'] = 'portfolio';
$string['portfolios'] = 'portfolios';
$string['Viewscollections'] = 'Pages and collections';
$string['viewsubmittedtogroup'] = 'This page has been submitted to <a href="%s">%s</a>.';
$string['viewsubmittedtogroupon'] = 'This page was submitted to <a href="%s">%s</a> on %s.';
$string['viewsubmittedtogroup1'] = 'This portfolio has been submitted to <a href="%s">%s</a>.';
$string['viewsubmittedtogroupon1'] = 'This portfolio was submitted to <a href="%s">%s</a> on %s.';
$string['viewsubmittedtogroupgrade'] = 'This portfolio was submitted to the assignment <a href="%s">"%s"</a> in "%s" on %s.';
$string['collectionsubmittedtogroup'] = 'This collection has been submitted to <a href="%s">%s</a>.';
$string['collectionsubmittedtogroupon'] = 'This collection was submitted to <a href="%s">%s</a> on %s.';
......
......@@ -4242,10 +4242,10 @@ class View {
$time = (!empty($data['submittedtime'])) ? format_date(strtotime($data['submittedtime'])) : null;
if (!empty($status) && !empty($time)) {
$data['submittedto'] = get_string('viewsubmittedtogroupon', 'view', $url, $name, $time);
$data['submittedto'] = get_string('viewsubmittedtogroupon1', 'view', $url, $name, $time);
}
else if (!empty($status)) {
$data['submittedto'] = get_string('viewsubmittedtogroup', 'view', $url, $name);
$data['submittedto'] = get_string('viewsubmittedtogroup1', 'view', $url, $name);
}
if ($status == self::PENDING_RELEASE) {
$data['submittedto'] .= ' ' . get_string('submittedpendingrelease', 'view');
......
......@@ -176,10 +176,10 @@ if ($USER->is_logged_in() && $submittedgroup && group_user_can_assess_submitted_
$text = get_string('viewsubmittedtogroupgrade', 'view', group_homepage_url($submittedgroup), $ltiassignmentname, $lticoursename, format_date(strtotime($view->get('submittedtime'))));
}
else if ($view->get('submittedtime')) {
$text = get_string('viewsubmittedtogroupon', 'view', group_homepage_url($submittedgroup), hsc($submittedgroup->name), format_date(strtotime($view->get('submittedtime'))));
$text = get_string('viewsubmittedtogroupon1', 'view', group_homepage_url($submittedgroup), hsc($submittedgroup->name), format_date(strtotime($view->get('submittedtime'))));
}
else {
$text = get_string('viewsubmittedtogroup', 'view', group_homepage_url($submittedgroup), hsc($submittedgroup->name));
$text = get_string('viewsubmittedtogroup1', 'view', group_homepage_url($submittedgroup), hsc($submittedgroup->name));
}
if (($releasecollection && $collection->get('submittedstatus') == Collection::SUBMITTED) || $view->get('submittedstatus') == View::SUBMITTED && empty($ltigradeform)) {
$releaseform = pieform(array(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment