--- loncom/interface/lonmsgdisplay.pm 2006/12/23 06:19:10 1.56 +++ loncom/interface/lonmsgdisplay.pm 2006/12/23 06:22:36 1.56.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.56 2006/12/23 06:19:10 albertel Exp $ +# $Id: lonmsgdisplay.pm,v 1.56.2.1 2006/12/23 06:22:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -301,20 +301,16 @@ sub scrollbuttons { $start++; $maxdis++;$first++;$finish++; my %statushash = &get_msgstatus_types(); - my $status; - if ($msgstatus eq '') { - $status = &mt('All'); - } else { - $status = $statushash{$msgstatus}; - } + return - ''.&mt('Page').': '. - ''. - ''. - ' of '.$maxdis. - ''. - '
'. - &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; + ''.&mt('Page').': '. + ''. + ''. + ' of '.$maxdis. + ''. + '
'. + &mt('_location_in_mail_folder',$msgstatus,$statushash{$msgstatus}, + $first,$finish,$total).''; } # =============================================================== Status Change @@ -393,8 +389,8 @@ sub deletefolder { my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); if (@messages > 0) { return &mt('The folder "[_1]" contains messages so it may not be deleted.',$folder). - '
'. - &mt('Delete or move the messages to a different folder first.'); + '
'. + &mt('Delete or move the messages to a different folder first.'); } my $delresult = &Apache::lonnet::del('email_folders',[$folder]); return $delresult; @@ -965,13 +961,9 @@ ENDDISHEADER my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { - if ($msgstatus eq '') { - $r->print('

'.&mt('Empty Folder').'

'); - } elsif ($msgstatus eq 'replied') { - $r->print('

'.&mt('You have not replied to any messages in this folder.').'

'); - } else { - $r->print('

'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'

'); - } + $r->print('

'.&mt('_empty_mail_folder', + $msgstatus, + $statushash{$msgstatus}).'

'); return; } unless ($interdis) {