Merged from 1.7.

This commit is contained in:
vyshane 2007-02-14 02:57:37 +00:00
parent 0985b11b80
commit aa91a2f22c
3 changed files with 3 additions and 2 deletions

View File

@ -130,6 +130,7 @@ $string['namesocial'] = 'Social forum';
$string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7
$string['newforumposts'] = 'New forum posts';
$string['nodiscussions'] = 'There are no discussion topics yet in this forum';
$string['nodiscussionsstartedby'] = 'No discussions started by this user';
$string['noguestpost'] = 'Sorry, guests are not allowed to post.';
$string['noguestsubscribe'] = 'Sorry, guests are not allowed to subscribe to receive forum postings by email.';
$string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking options.';

View File

@ -121,7 +121,7 @@
print_paging_bar($totalcount, $page, $perpage,
"user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&");
} else {
print_heading(get_string('noposts', 'forum'));
print_heading(get_string('nodiscussionsstartedby', 'forum'));
}
echo '</div>';
print_footer($course);

View File

@ -128,7 +128,7 @@
$secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
'&amp;id='.$user->id.'&amp;mode=posts', get_string('posts', 'forum'));
$secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
'&amp;id='.$user->id.'&amp;mode=discussions', get_string('discussions', 'forum'));
'&amp;id='.$user->id.'&amp;mode=discussions', get_string('discussionsstartedby', 'forum'));
}
}