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

Merge branch 'MDL-55566_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-11-18 09:05:26 +08:00
parent 5af0e614bb 5223adf258
commit 2585fa374e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/chat/lang/en/chat.php
+1 -1
View File
@@ -131,7 +131,7 @@ $string['serverip'] = 'Server ip';
$string['servermax'] = 'Max users';
$string['serverport'] = 'Server port';
$string['sessions'] = 'Chat sessions';
$string['sessionstart'] = 'The next chat session will start in {$a}';
$string['sessionstart'] = 'The next chat session will start on {$a->date}, ({$a->fromnow} from now)';
$string['strftimemessage'] = '%H:%M';
$string['studentseereports'] = 'Everyone can view past sessions';
$string['studentseereports_help'] = 'If set to No, only users have mod/chat:readlog capability are able to see the chat logs';
mod/chat/view.php
+4 -1
View File
@@ -119,7 +119,10 @@ if (has_capability('mod/chat:chat', $context)) {
$span = $chat->chattime - $now;
if ($chat->chattime and $chat->schedule and ($span > 0)) { // A chat is scheduled.
echo '<p>';
echo get_string('sessionstart', 'chat', format_time($span));
$chatinfo = new stdClass();
$chatinfo->date = userdate($chat->chattime);
$chatinfo->fromnow = format_time($span);
echo get_string('sessionstart', 'chat', $chatinfo);
echo '</p>';
}