Commit 2f6d0984 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Add more info to cron message (Bug 987115)"

parents 9cc6fa14 3dbaf96a
...@@ -219,7 +219,7 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups'; ...@@ -219,7 +219,7 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups';
$string['viewsperuser'] = 'Users who make pages have about %s pages each'; $string['viewsperuser'] = 'Users who make pages have about %s pages each';
$string['Cron'] = 'Cron'; $string['Cron'] = 'Cron';
$string['runningnormally'] = 'Running normally'; $string['runningnormally'] = 'Running normally';
$string['cronnotrunning'] = '<span class="error">Cron is not running.</span><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up.'; $string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['Loggedin'] = 'Logged in'; $string['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...'; $string['youraverageuser'] = 'Your average user...';
$string['statsmaxfriends'] = 'Has %s friends (most is <a href="%s">%s</a> with %d)'; $string['statsmaxfriends'] = 'Has %s friends (most is <a href="%s">%s</a> with %d)';
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
<div><strong>{str tag=diskusage section=admin}:</strong> {$sitedata.diskusage|display_size}</div> <div><strong>{str tag=diskusage section=admin}:</strong> {$sitedata.diskusage|display_size}</div>
{/if} {/if}
<div><strong>{str tag=maharaversion section=admin}:</strong> {$sitedata.release}{if $sitedata.strlatestversion} ({$sitedata.strlatestversion|clean_html|safe}){/if}</div> <div><strong>{str tag=maharaversion section=admin}:</strong> {$sitedata.release}{if $sitedata.strlatestversion} ({$sitedata.strlatestversion|clean_html|safe}){/if}</div>
<div><strong>{str tag=Cron section=admin}:</strong> {if $sitedata.cronrunning}{str tag=runningnormally section=admin}{else}{str tag=cronnotrunning section=admin}{/if}</div> <div><strong>{str tag=Cron section=admin}:</strong> {if $sitedata.cronrunning}{str tag=runningnormally section=admin}{else}{str tag=cronnotrunning1 section=admin}{/if}</div>
</div> </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