moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-05-24 11:00:09 +12:00
commit 119e228621
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/forum/lang/en/forum.php
View file

@ -300,8 +300,8 @@ $string['oldpostdays'] = 'Read after days';
$string['openmode0'] = 'No discussions, no replies';
$string['openmode1'] = 'No discussions, but replies are allowed';
$string['openmode2'] = 'Discussions and replies are allowed';
$string['overviewnumpostssince'] = 'posts since last login';
$string['overviewnumunread'] = 'total unread';
$string['overviewnumpostssince'] = '{$a} posts since last login';
$string['overviewnumunread'] = '{$a} total unread';
$string['page-mod-forum-x'] = 'Any forum module page';
$string['page-mod-forum-view'] = 'Forum module main page';
$string['page-mod-forum-discuss'] = 'Forum module discussion thread page';

6
mod/forum/lib.php
View file

@ -1380,8 +1380,6 @@ function forum_print_overview($courses,&$htmlarray) {
}
$strforum = get_string('modulename','forum');
$strnumunread = get_string('overviewnumunread','forum');
$strnumpostssince = get_string('overviewnumpostssince','forum');
foreach ($forums as $forum) {
$str = '';
@ -1400,9 +1398,9 @@ function forum_print_overview($courses,&$htmlarray) {
$str .= '<div class="overview forum"><div class="name">'.$strforum.': <a title="'.$strforum.'" href="'.$CFG->wwwroot.'/mod/forum/view.php?f='.$forum->id.'">'.
$forum->name.'</a></div>';
$str .= '<div class="info"><span class="postsincelogin">';
$str .= $count.' '.$strnumpostssince."</span>";
$str .= get_string('overviewnumpostssince', 'forum', $count)."</span>";
if (!empty($showunread)) {
$str .= '<div class="unreadposts">'.$thisunread .' '.$strnumunread.'</div>';
$str .= '<div class="unreadposts">'.get_string('overviewnumunread', 'forum', $thisunread).'</div>';
}
$str .= '</div></div>';
}