diff --git a/lang/en_utf8/langconfig.php b/lang/en_utf8/langconfig.php index cfc066e302d..d5f3d9f5c12 100644 --- a/lang/en_utf8/langconfig.php +++ b/lang/en_utf8/langconfig.php @@ -14,6 +14,7 @@ $string['oldcharset'] = 'ISO-8859-1'; $string['strftimedate'] = '%%d %%B %%Y'; $string['strftimedateshort'] = '%%d %%B'; $string['strftimedatetime'] = '%%d %%B %%Y, %%I:%%M %%p'; +$string['strftimedatetimeshort'] = '%%d/%%m/%%y, %%H:%%M'; $string['strftimedaydate'] = '%%A, %%d %%B %%Y'; $string['strftimedaydatetime'] = '%%A, %%d %%B %%Y, %%I:%%M %%p'; $string['strftimedayshort'] = '%%A, %%d %%B'; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 3cfc956de32..44b91041cf9 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5162,7 +5162,7 @@ function get_string($identifier, $module='', $a=NULL, $extralocations=NULL) { 'parentlanguage', 'strftimedate', 'strftimedateshort', 'strftimedatetime', 'strftimedaydate', 'strftimedaydatetime', 'strftimedayshort', 'strftimedaytime', 'strftimemonthyear', 'strftimerecent', 'strftimerecentfull', 'strftimetime', - 'thischarset', 'thisdirection', 'thislanguage'); + 'thischarset', 'thisdirection', 'thislanguage', 'strftimedatetimeshort'); $filetocheck = 'langconfig.php'; $defaultlang = 'en_utf8'; diff --git a/message/discussion.php b/message/discussion.php index 8f82b25bf47..220b561381a 100644 --- a/message/discussion.php +++ b/message/discussion.php @@ -199,8 +199,8 @@ if ($messages = get_records_select('message_read', "(useridto = '$USER->id' AND useridfrom = '$userid' AND timeread > '$start' $lastsql) OR (useridto = '$userid' AND useridfrom = '$USER->id' AND timeread > '$start' $lastsql)")) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); - + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); + if ($message->useridfrom == $USER->id) { $fullname = $mefullname; } else { @@ -223,7 +223,7 @@ if ($messages = get_records_select('message', "useridto = '$userid' AND useridfrom = '$USER->id' $lastsql")) { foreach ($messages as $message) { - $time = userdate($message->timecreated, get_string('strftimedaytime')); + $time = userdate($message->timecreated, get_string('strftimedatetimeshort')); $printmessage = format_text($message->message, $message->format, $options, 0); $printmessage = '