--- loncom/interface/lonmsgdisplay.pm 2006/11/29 07:46:39 1.44 +++ loncom/interface/lonmsgdisplay.pm 2006/11/29 19:31:47 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.44 2006/11/29 07:46:39 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.45 2006/11/29 19:31:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -704,17 +704,10 @@ ENDLINK if ($numblocked > 0) { my $beginblock = &Apache::lonlocal::locallocaltime($startblock); my $finishblock = &Apache::lonlocal::locallocaltime($endblock); - if ($numblocked == 1) { - $r->print("

".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".

"); - $r->print(&mt('This message is not viewable because').' '); - } else { - $r->print("

".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".

"); - $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because ')); - } - $r->print( -&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.'); - $r->print(&Apache::loncommon::build_block_table($startblock,$endblock, - \%setters)); + $r->print('

'.&mt('You have [quant,_1,blocked unread message,blocked unread messages].',$numblocked).'

'."\n". + &mt('[quant,_1,message is,messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock).'
'."\n". + &Apache::loncommon::build_block_table($startblock,$endblock, + \%setters)); } } @@ -883,7 +876,7 @@ ENDDISHEADER my $beginblock = &Apache::lonlocal::locallocaltime($startblock); my $finishblock = &Apache::lonlocal::locallocaltime($endblock); $r->print('

'. - $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.')); + &mt('[_1,quant,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock)); $r->print(&Apache::loncommon::build_block_table($startblock,$endblock, \%setters)); } @@ -1598,9 +1591,10 @@ sub blocktype_text { 'chat' => 'Chat', 'boards' => 'Discussion', 'port' => 'Portfolio', - 'groups' => 'Groups' + 'groups' => 'Groups', + 'blogs' => 'Blogs', ); - my $typeorder = ['com','chat','boards','port','groups']; + my $typeorder = ['com','chat','boards','port','groups','blogs']; return ($typeorder,\%types); }