--- loncom/interface/lonfeedback.pm 2003/09/17 17:50:49 1.59 +++ loncom/interface/lonfeedback.pm 2003/10/15 20:13:31 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.59 2003/09/17 17:50:49 albertel Exp $ +# $Id: lonfeedback.pm,v 1.63 2003/10/15 20:13:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,6 +51,7 @@ use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); use Apache::lontexconvert(); +use Apache::lonlocal; sub list_discussion { my ($mode,$status,$symb)=@_; @@ -88,10 +89,10 @@ sub list_discussion { if ($contrib{$idx.':attachmenturl'}) { my ($fname,$ft) =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); - $message.='

Attachment: '.$fname.'.'.$ft.''; + '">'.$fname.'.'.$ft.'

'; } if ($message) { if ($hidden) { @@ -104,7 +105,7 @@ sub list_discussion { $contrib{$idx.':sendername'}, $contrib{$idx.':senderdomain'}); - my $sender='Anonymous'; + my $sender=&mt('Anonymous'); if ((!$contrib{$idx.':anonymous'}) || ($seeid)) { $sender=&Apache::loncommon::aboutmewrapper( $plainname, @@ -113,19 +114,19 @@ sub list_discussion { $contrib{$idx.':sendername'}.' at '. $contrib{$idx.':senderdomain'}.')'; if ($contrib{$idx.':anonymous'}) { - $sender.=' [anonymous] '. + $sender.=' ['.&mt('anonymous').'] '. $screenname; } if ($seeid) { if ($hidden) { $sender.=' Make Visible'; + $symb.':::'.$idx.'">'.&mt('Make Visible').''; } else { $sender.=' Hide'; + $symb.':::'.$idx.'">'.&mt('Hide').''; } $sender.=' Delete'; + $symb.':::'.$idx.'">'.&mt('Delete').''; } } else { if ($screenname) { @@ -158,7 +159,7 @@ sub list_discussion {
Note: in anonymous discussion, your name is visible only to course faculty
- +

Attachment (128 KB max size):

@@ -181,7 +182,8 @@ sub mail_screen { The LearningOnline Network with CAPA - $bodytag

$title

- + Please check at least one of the following feedback types: -$options
-My question/comment/feedback:

+$options

+

My question/comment/feedback:

+

$latexHelp -

+

+

Attachment (128 KB max size):

- +

ENDDOCUMENT @@ -249,12 +254,12 @@ sub fail_redirect { my ($r,$feedurl) = @_; $r->print (<Feedback not sent - - + + - + Sorry, no recipients ... @@ -266,15 +271,15 @@ sub redirect_back { $r->print (< Feedback sent - + - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). -$status +$status
@@ -286,7 +291,7 @@ sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (<Feedback not sent - + ENDNOREDIR if ($feedurl!~/^\/adm\/feedback/) { @@ -297,7 +302,7 @@ ENDNOREDIR - + Sorry, no feedback possible on this resource ... @@ -310,37 +315,39 @@ sub screen_header { my $discussoptions=''; if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { $msgoptions= - '

Feedback to resource author'; + '

'. + &mt('Feedback to resource author').'

'; } if (&feedback_available(1)) { $msgoptions.= - '
Question about resource content'; + '
'. + &mt('Question about resource content'); } if (&feedback_available(0,1)) { $msgoptions.= - '
'. - 'Question/Comment/Feedback about course content'; + '
'. + &mt('Question/Comment/Feedback about course content'); } if (&feedback_available(0,0,1)) { $msgoptions.= - '
'. - 'Question/Comment/Feedback about course policy'; + '
'. + &mt('Question/Comment/Feedback about course policy'); } if ($ENV{'request.course.id'}) { if (&Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $discussoptions=' '. - 'Contribution to course discussion of resource'; - $discussoptions.='
'. - 'Anonymous contribution to course discussion of resource'. - ' (name only visible to course faculty)'; + $discussoptions=' '. + &mt('Contribution to course discussion of resource'); + $discussoptions.='
'. + &mt('Anonymous contribution to course discussion of resource'). + ' ('.&mt('name only visible to course faculty').')'; } } - if ($msgoptions) { $msgoptions='

Sending Messages

'.$msgoptions; } + if ($msgoptions) { $msgoptions='

'.&mt('Sending Messages').'

'.$msgoptions; } if ($discussoptions) { - $discussoptions='

Discussion Contributions

'.$discussoptions; } + $discussoptions='

'.&mt('Discussion Contributions').'

'.$discussoptions; } return $msgoptions.$discussoptions; } @@ -365,14 +372,14 @@ sub clear_out_html { # allows


      • #
        my %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1, - BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1); + BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1, + M=>1); $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/ {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge; $message =~ s/(\]*)\>/ {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge; } else { - $message=~s/\<\/*m\s*\>//g; $message=~s/\/\>\;/g; } @@ -389,7 +396,7 @@ ENDEMAIL my $citations=<<"ENDCITE";

        Previous attempts of student (if applicable)

        $prevattempts -

        +

        Original screen output (if applicable)

        $usersaw

        Correct Answer(s) (if applicable)

        @@ -436,7 +443,7 @@ sub decide_receiver { } } if ($ENV{'form.course'}||$course) { - $typestyle.='Submitting as Comment
        '; + $typestyle.='Submitting as Comment
        '; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) ) { @@ -445,7 +452,7 @@ sub decide_receiver { } } if ($ENV{'form.policy'}||$policy) { - $typestyle.='Submitting as Policy Feedback
        '; + $typestyle.='Submitting as Policy Feedback
        '; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) ) { @@ -476,7 +483,7 @@ sub send_msg { unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), 'Feedback ['.$declutter.']',$email,$citations,$feedurl, $attachmenturl)=~/ok/) { - $status.='
        Error sending message to '.$_.'
        '; + $status.='
        '.&mt('Error sending message to').' '.$_.'
        '; } else { $sendsomething++; } @@ -490,7 +497,7 @@ sub send_msg { $newrecord{'resource'}=$feedurl; $newrecord{'subnumber'}=$record{'subnumber'}+1; unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { - $status.='
        Not registered
        '; + $status.='
        '.&mt('Not registered').'
        '; } } @@ -521,7 +528,7 @@ sub adddiscuss { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); my %storenewentry=($symb => time); - $status.='
        Updating discussion time: '. + $status.='
        '.&mt('Updating discussion time').': '. &Apache::lonnet::put('discussiontimes',\%storenewentry, $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); @@ -532,13 +539,13 @@ sub adddiscuss { my %newrecord=(); $newrecord{'resource'}=$symb; $newrecord{'subnumber'}=$record{'subnumber'}+1; - $status.='
        Registering: '. + $status.='
        '.&mt('Registering').': '. &Apache::lonnet::cstore(\%newrecord,'_discussion'); } } else { $status.='Failed.'; } - return $status.'
        '; + return $status.'
        '; } # ----------------------------------------------------------- Preview function @@ -603,7 +610,7 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - 'Changed discussion status

        ','0','0'); + &mt('Changed discussion status').'
        ','0','0'); } elsif ($ENV{'form.deldisc'}) { # --------------------------------------------------------------- Hide for good $r->content_type('text/html'); @@ -630,7 +637,7 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - 'Changed discussion status

        ','0','0'); + &mt('Changed discussion status').'
        ','0','0'); } elsif ($ENV{'form.preview'}) { # -------------------------------------------------------- User wants a preview &show_preview($r); @@ -640,6 +647,7 @@ sub handler { $feedurl=~s/^http\:\/\///; $feedurl=~s/^$ENV{'SERVER_NAME'}//; $feedurl=~s/^$ENV{'HTTP_HOST'}//; + $feedurl=~s/\?.+$//; my $symb=&Apache::lonnet::symbread($feedurl); unless ($symb) { @@ -737,7 +745,7 @@ sub handler { } } else { # Ambiguous Problem Resource - if ( $Apache::lonnet::mod_perl_version() == 2 ) { + if ( &Apache::lonnet::mod_perl_version() == 2 ) { &Apache::lonnet::cleanenv(); } $r->internal_redirect('/adm/ambiguous');