L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-61322-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2018-03-07 10:57:46 +08:00
parent 7d0f502483 9dd8490aa6
commit e0008d0ae3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/log/classes/table_log.php
+1 -1
View File
@@ -143,7 +143,7 @@ class report_log_table_log extends table_sql {
public function col_time($event) {
if (empty($this->download)) {
$dateformat = get_string('strftimerecent', 'core_langconfig');
$dateformat = get_string('strftimedatetime', 'core_langconfig');
} else {
$dateformat = get_string('strftimedatetimeshort', 'core_langconfig');
}
report/loglive/classes/table_log.php
+1 -1
View File
@@ -116,7 +116,7 @@ class report_loglive_table_log extends table_sql {
* @return string HTML for the time column
*/
public function col_time($event) {
$recenttimestr = get_string('strftimerecent', 'core_langconfig');
$recenttimestr = get_string('strftimedatetime', 'core_langconfig');
return userdate($event->timecreated, $recenttimestr);
}