[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.93 and 1.94

version 1.93, 2008/10/08 14:56:50 version 1.94, 2008/10/23 10:15:37
Line 1239  sub compout { Line 1239  sub compout {
     my $dismsg='';      my $dismsg='';
     my $disbase='';      my $disbase='';
     my $attachrow;      my $attachrow;
     my $func=&mt('Send New');      my $func1='Send'; # do not translate here!
       my %func2=( # do not translate here!
                  'ma'  => 'Message',
                  'msg' => 'Messages',
                 );
     my %lt=&Apache::lonlocal::texthash('us'  => 'Username',      my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
        'do'  => 'Domain',         'do'  => 'Domain',
        'ad'  => 'Additional Recipients',         'ad'  => 'Additional Recipients',
Line 1247  sub compout { Line 1251  sub compout {
                                        'ar'  => 'Allow replies',                                         'ar'  => 'Allow replies',
        'sb'  => 'Subject',         'sb'  => 'Subject',
        'ca'  => 'Cancel',         'ca'  => 'Cancel',
        'ma'  => 'Mail',  
                                        'msg' => 'Messages',  
                                        'gen' => 'Generate messages from a file',                                         'gen' => 'Generate messages from a file',
                                        'gmt' => 'General message text',                                         'gmt' => 'General message text',
                                        'tff' => 'The file format for the uploaded portion of the message is',                                         'tff' => 'The file format for the uploaded portion of the message is',
Line 1296  sub compout { Line 1298  sub compout {
  %content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder);   %content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder);
  $dispcrit.='<input type="hidden" name="forwid" value="'.   $dispcrit.='<input type="hidden" name="forwid" value="'.
     $forwarding.'" />';      $forwarding.'" />';
  $func=&mt('Forward');   $func1='Forward'; # do not translate here!
   
  $dissub=&mt('Forwarding').': '.$content{'subject'};   $dissub=&mt('Forwarding').': '.$content{'subject'};
  $dismsg=&mt('Forwarded message from').' '.   $dismsg=&mt('Forwarded message from').' '.
Line 1310  sub compout { Line 1312  sub compout {
  %content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder);   %content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder);
  $dispcrit.='<input type="hidden" name="replyid" value="'.   $dispcrit.='<input type="hidden" name="replyid" value="'.
     $replying.'" />';      $replying.'" />';
  $func=&mt('Send Reply to');   $func1='Send Reply to'; # do not translate here!
   
  $dissub=&mt('Reply').': '.$content{'subject'};          $dissub=&mt('Reply').': '.$content{'subject'};       
  $dismsg='> '.$content{'message'};   $dismsg='> '.$content{'message'};
Line 1421  ENDREPSCRIPT Line 1423  ENDREPSCRIPT
                   &mt('Unless you choose otherwise:').'<ul><li>'.                    &mt('Unless you choose otherwise:').'<ul><li>'.
         &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.          &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
         &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');          &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
         $func=&mt('Forward');          $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';          $dissub = &mt('Forwarding').': ';
         $subj_size = '10';          $subj_size = '10';
         my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.          my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.
Line 1440  $latexHelp. Line 1442  $latexHelp.
         foreach my $msg (@to_forward) {          foreach my $msg (@to_forward) {
             $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');              $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
         }          }
         $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'msg'},          $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'msg'}),
                                      \%lt));                                       \%lt));
     } elsif ($broadcast ne 'upload') {      } elsif ($broadcast ne 'upload') {
         $subj_size = '50';          $subj_size = '50';
Line 1462  $attachrow Line 1464  $attachrow
 $dispcrit  $dispcrit
 $disbase  $disbase
 ENDCOMP  ENDCOMP
         $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'},          $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
                                      \%lt));                                       \%lt));
         $r->print($citation);          $r->print($citation);
         if (exists($env{'form.ref'})) {          if (exists($env{'form.ref'})) {
Removed from v.1.93  
changed lines
  Added in v.1.94

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>