Commit 81e4dcd3 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1800917: Alter 'strftimedateshort' date to match the long version



behatnotneeded

Change-Id: I1a5417ab6730d01d7a22828ff07d84ddedf4d212
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 1a81d018
......@@ -631,7 +631,7 @@ class ArtefactTypeTask extends ArtefactType {
if ($result->completiondate < $datenow && !$result->completed) {
$result->completed = -1;
}
$result->completiondate = format_date($result->completiondate, 'strftimedate');
$result->completiondate = format_date($result->completiondate, 'strftimedateshort');
}
if($result->description){
$result->description = '<p>' . preg_replace('/\n\n/','</p><p>', $result->description) . '</p>';
......
......@@ -15,7 +15,7 @@ $string['parentlanguage'] = '';
$string['pieform_calendar_dateformat'] = '%%Y/%%m/%%d';
$string['pieform_calendar_timeformat'] = '%%H:%%M';
$string['strftimedate'] = '%%e %%B %%Y';
$string['strftimedateshort'] = '%%d %%B';
$string['strftimedateshort'] = '%%e %%b %%Y';
$string['strftimedatetime'] = '%%d %%B %%Y, %%l:%%M %%p';
$string['strftimedatetimeshort'] = '%%Y/%%m/%%d %%H:%%M';
$string['strftimedaydate'] = '%%A, %%d %%B %%Y';
......
......@@ -40,7 +40,7 @@ function site_statistics($full=false) {
}
$sql = "SELECT SUM($todaysql) AS today, SUM($thisweeksql) AS thisweek, $weekago AS weekago, SUM($eversql) AS ever FROM {usr}";
$active = get_record_sql($sql);
$data['usersloggedin'] = get_string('loggedinsince', 'admin', $active->today, $active->thisweek, format_date(strtotime($active->weekago), 'strftimedateshort'), $active->ever);
$data['usersloggedin'] = get_string('loggedinsince', 'admin', $active->today, $active->thisweek, format_date(strtotime($active->weekago), 'strftimedate'), $active->ever);
$memberships = count_records_sql("
SELECT COUNT(*)
......@@ -281,7 +281,7 @@ function institution_statistics($institution, $full=false) {
WHERE id IN (" . $data['memberssql'] . ")";
$active = get_record_sql($sql, $data['memberssqlparams']);
}
$data['usersloggedin'] = get_string('loggedinsince', 'admin', $active->today, $active->thisweek, format_date(strtotime($active->weekago), 'strftimedateshort'), $active->ever);
$data['usersloggedin'] = get_string('loggedinsince', 'admin', $active->today, $active->thisweek, format_date(strtotime($active->weekago), 'strftimedate'), $active->ever);
if (!$data['users']) {
$data['groupmemberaverage'] = 0;
......
......@@ -13,7 +13,7 @@
<span class="icon icon-times text-danger icon-lg left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="text-danger">{$task->title}</span> -
<span class="text-small text-midtone">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
{str tag='completiondate' section='artefact.plans'}: {$task->completiondateshort}
</span>
</div>
......
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