Skip to content

Commit

Permalink
Merge branch 'MDL-43725-25' of git://github.com/ankitagarwal/moodle i…
Browse files Browse the repository at this point in the history
…nto MOODLE_25_STABLE
  • Loading branch information
Damyon Wiese committed Jan 21, 2014
2 parents 7bf3f87 + 9702075 commit 9102d4e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions report/loglive/index.php
Expand Up @@ -44,6 +44,11 @@
require_capability('report/loglive:view', $context);

$strlivelogs = get_string('livelogs', 'report_loglive');
if (!empty($page)) {
$strlogs = get_string('logs'). ": ". get_string('page', 'report_loglive', $page + 1);
} else {
$strlogs = get_string('logs');
}

if ($inpopup) {
session_get_instance()->write_close();
Expand Down
1 change: 1 addition & 0 deletions report/loglive/lang/en/report_loglive.php
Expand Up @@ -27,3 +27,4 @@
$string['loglive:view'] = 'View live logs';
$string['pluginname'] = 'Live logs';
$string['livelogs'] = 'Live logs from the past hour';
$string['page'] = 'Page {$a}';

0 comments on commit 9102d4e

Please sign in to comment.