Skip to content
Browse files

Merge branch 'MDL-26562-22' of git://github.com/vadimonus/moodle into…

… MOODLE_22_STABLE
  • Loading branch information...
2 parents 605b539 + d78b67b commit 05ceae9bb2e12dbf52d210b299bbd9f38e3c3bd3 Sam Hemelryk committed May 24, 2012
Showing with 4 additions and 6 deletions.
  1. +2 −2 mod/forum/lang/en/forum.php
  2. +2 −4 mod/forum/lib.php
View
4 mod/forum/lang/en/forum.php
@@ -280,8 +280,8 @@
$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';
View
6 mod/forum/lib.php
@@ -1291,8 +1291,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 = '';
@@ -1311,9 +1309,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>';
}

0 comments on commit 05ceae9

Please sign in to comment.
Something went wrong with that request. Please try again.