--- loncom/interface/lonmsgdisplay.pm 2009/09/08 22:08:20 1.134 +++ loncom/interface/lonmsgdisplay.pm 2009/09/25 16:35:29 1.135 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.134 2009/09/08 22:08:20 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.135 2009/09/25 16:35:29 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1268,8 +1268,9 @@ sub compout { &printheader($r,'/adm/email?compose=multiforward', 'Forwarding Multiple Messages'); if ($multiforward > 1) { - $r->print(&mt('Each of the [quant,_1,message] you checked' - .' will be forwarded to the recipient(s) you select below.',$multiforward) + $r->print(&mt('Each of the [quant,_1,message] you checked' + .' will be forwarded to the recipient(s) you select below.' + ,''.$multiforward.'') .'
'); } else { $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'
'); @@ -3352,7 +3353,7 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Read'); - $r->print(&mt('Marked [_1] message(s) read',$total).'

'); + $r->print(&mt('Marked [quant,_1,message] read',$total).'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedunread') { @@ -3363,7 +3364,7 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Unread'); - $r->print(&mt('Marked [_1] message(s) unread',$total).'

'); + $r->print(&mt('Marked [quant,_1,message] unread',$total).'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedmove') { @@ -3387,14 +3388,17 @@ sub handler { } } if ($failed) { - $r->print('

- '.&mt('Failed to move [_1] message(s)',$failed). - '

'); + $r->print('

' + .&mt('Failed to move [quant,_1,message]',$failed) + .'

'); $r->print('

'. join("

\n

",@failed_msg). "

\n"); } - $r->print(&mt('Moved [_1] message(s)',$total).'

'); + $r->print('

' + .&mt('Moved [quant,_1,message]',$total) + .'

' + .'

'); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -3413,14 +3417,17 @@ sub handler { } &printheader($r,'','Deleted Messages'); if ($failed) { - $r->print('

- '.&mt('Failed to delete [_1] message(s)',$failed). - '

'); + $r->print('

' + .&mt('Failed to delete [quant,_1,message]',$failed) + .'

'); $r->print('

'. join("

\n

",@failed_msg). "

\n"); } - $r->print(&mt('Deleted [_1] message(s)',$total).'

'); + $r->print('

' + .&mt('Deleted [quant,_1,message]',$total) + .'

' + .'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markunread'}) { @@ -3512,10 +3519,14 @@ sub handler { my $showfolder = $env{'form.newfolder'}; my ($makeresult,$warning) = &makefolder($env{'form.newfolder'}); if ($makeresult eq 'ok') { - $r->print(&mt('Folder "[_1]" created.',$showfolder).'
'); + $r->print('

' + .&mt('Folder "[_1]" created.',$showfolder) + .'

'); } else { - $r->print(&mt('Creation failed.').' '.$makeresult.'
'. - $warning); + $r->print('

' + .&mt('Creation failed.').' '.$makeresult.'
' + .$warning + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3527,10 +3538,14 @@ sub handler { my $showfolder = ''; my $delresult = &deletefolder($folder); if ($delresult eq 'ok') { - $r->print(&mt('Folder "[_1]" deleted.',$folder).'
'); + $r->print('

' + .&mt('Folder "[_1]" deleted.',$folder) + .'

'); $env{'form.folder'} = ''; } else { - $r->print(&mt('Deletion failed.').' '.$delresult.'
'); + $r->print('

' + .&mt('Deletion failed.').' '.$delresult + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3540,9 +3555,13 @@ sub handler { my $showfolder = $env{'form.renamed'}; my $renresult = &renamefolder($folder); if ($renresult eq 'ok') { - $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'
'); + $r->print('

' + .&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder) + .'

'); } else { - $r->print(&mt('Renaming failed.').' '.$renresult.'
'); + $r->print('

' + .&mt('Renaming failed.').' '.$renresult + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r);