MDL-12300 message window does show date now

This commit is contained in:
jerome
2008-05-08 03:40:47 +00:00
parent 1d8c89c4ad
commit a85c4eefaf
6 changed files with 10 additions and 9 deletions
+1
View File
@@ -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';
+1 -1
View File
@@ -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';
+4 -4
View File
@@ -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 = '<div class="message other"><span class="author">'.$mefullname.'</span> '.
@@ -241,7 +241,7 @@
if ($messages = get_records_select('message', "useridto = '$USER->id' AND useridfrom = '$userid' $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 = '<div class="message other"><span class="author">'.$userfullname.'</span> '.
+2 -2
View File
@@ -408,7 +408,7 @@ function message_print_search_results($frm) {
echo "</tr>\n";
$blockedcount = 0;
$dateformat = get_string('strftimedatetime');
$dateformat = get_string('strftimedatetimeshort');
$strcontext = get_string('context', 'message');
foreach ($messages as $message) {
@@ -910,7 +910,7 @@ function message_format_message(&$message, &$user, $format='', $keywords='', $cl
if ($format) {
$dateformat = $format;
} else {
$format = get_string('strftimedaytime');
$format = get_string('strftimedatetimeshort');
}
}
$time = userdate($message->timecreated, $dateformat);
+1 -1
View File
@@ -50,7 +50,7 @@
if ($messages = get_records_select('message', "useridto = '$USER->id' AND useridfrom = '$userid'",
'timecreated')) {
foreach ($messages as $message) {
$time = userdate($message->timecreated, get_string('strftimedaytime'));
$time = userdate($message->timecreated, get_string('strftimedatetimeshort'));
$options = new object();
$options->para = false;
+1 -1
View File
@@ -74,7 +74,7 @@ if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTE
$options->newlines = true;
$message = format_text($message, $format, $options);
$time = userdate(time(), get_string('strftimedaytime'));
$time = userdate(time(), get_string('strftimedatetimeshort'));
$message = '<div class="message me"><span class="author">'.fullname($USER).'</span> '.
'<span class="time">['.$time.']</span>: '.
'<span class="content">'.$message.'</span></div>';