--- loncom/homework/structuretags.pm 2003/08/30 02:33:25 1.207 +++ loncom/homework/structuretags.pm 2003/10/08 16:35:04 1.213 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.207 2003/08/30 02:33:25 albertel Exp $ +# $Id: structuretags.pm,v 1.213 2003/10/08 16:35:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use strict; use Apache::lonnet; use Apache::File(); use Apache::lonmenu; +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', @@ -114,7 +115,7 @@ sub page_start { &Apache::lonxml::whichuser(); if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help="Browsing resource, all submissions are temporary.
"; + $help=&mt("Browsing resource, all submissions are temporary.")."
"; $body_tag_start.=$help; } } @@ -159,8 +160,8 @@ sub setup_rndseed { $ENV{'form.rndseed'}=$rndseed; } } - if ($ENV{'form.resetdata'} eq 'New Problem Variation' || - $ENV{'form.newrandomization'} eq 'New Randomization') { + if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') || + $ENV{'form.newrandomization'} eq &mt('New Randomization')) { srand(time); $rndseed=int(rand(2100000000)); $ENV{'form.rndseed'}=$rndseed; @@ -178,43 +179,44 @@ sub setup_rndseed { sub problem_edit_header { return ' - - - -
- -

 

+ + + +
+ +

 

'; } sub problem_edit_footer { - return '

- '; + return '

+ '; } sub problem_web_to_edit_header { my ($rndseed)=@_; - my $result.=' - - - - - + my $result.=' + + + + + '.&mt(' Show All Foils').'
'; my $numtoanalyze=$ENV{'form.numtoanalyze'}; if (!$numtoanalyze) { $numtoanalyze=20; } - $result.= ' for + $result.= ' for versions of this problem.'. - &Apache::loncommon::help_open_topic("Analyze_Problem", + $numtoanalyze.'" size="5" /> '.&mt('versions of this problem'). + '.'.&Apache::loncommon::help_open_topic("Analyze_Problem", '',undef,undef,300). - '
'; + '
'; return $result; } @@ -260,17 +262,21 @@ sub finalize_storage { } sub checkout_msg { + my %lt=&Apache::lonlocal::texthash( + 'resource'=>'The resource needs to be checked out', + 'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.', + 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.', + 'checkout'=>'Check out Exam for Viewing', + 'checkout?'=>'Check out Exam?'); return (<The resource needs to be checked out -As a resource gets checked out, a unique timestamped ID is given to it, and a -permanent record is left in the system.

- -Checking out resources is subject to course policies, and may exclude future -credit even if done erroneously.

+

$lt{'resource'}

+

$lt{'id_expln'}

+ +

$lt{'warning'}
- +
ENDCHECKOUT } @@ -306,7 +312,9 @@ sub reset_problem_globals { undef(%Apache::lonhomework::history); undef(%Apache::lonhomework::results); undef($Apache::inputtags::part); - undef($Apache::lonhomework::parsing_a_problem); +#don't undef this, lonhomework.pm takes care of this, we use this to +#detect if we try to do 2 problems in one file +# undef($Apache::lonhomework::parsing_a_problem); undef($Apache::lonhomework::name); } @@ -347,7 +355,7 @@ sub start_problem { } #added vars to the scripting enviroment - my $expression='$external::part='.$Apache::inputtags::part.';'; + my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; &Apache::run::run($expression,$safeeval); my $status; my $accessmsg; @@ -379,7 +387,7 @@ sub start_problem { $form_tag_start.=''. ''. + value="'.&mt('New Problem Variation').'" />'. '
'; } @@ -398,9 +406,9 @@ sub start_problem { $result.= $head_tag_start.''; my $msg=$body_tag_start; if ($status eq 'UNAVAILABLE') { - $result.='

Unable to determine if this resource is open due to network problems. Please try again later.

'; + $result.='

'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'

'; } else { - $result.='

Not open to be viewed

'; + $result.='

'.&mt('Not open to be viewed').'

'; } if ($status eq 'CLOSED') { $msg.='The problem '.$accessmsg; @@ -411,9 +419,9 @@ sub start_problem { } elsif ($target eq 'tex') { $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm'; if ($status eq 'UNAVAILABLE') { - $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm '; + $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm '; } else { - $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; + $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; } } } elsif ($target eq 'web') { @@ -720,9 +728,9 @@ sub start_languageblock { $result=''; } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Include Language:','include', + $result .=&Apache::edit::text_arg(&mt('Include Language:'),'include', $token,40); - $result .=&Apache::edit::text_arg('Exclude Language:','exclude', + $result .=&Apache::edit::text_arg(&mt('Exclude Language:'),'exclude', $token,40); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -795,7 +803,7 @@ sub start_while { } } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); - $result .=&Apache::edit::text_arg('Test Condition:','condition', + $result .=&Apache::edit::text_arg(&mt('Test Condition:'),'condition', $token,40); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -827,7 +835,7 @@ sub end_while { $return = &Apache::run::run($code,$safeeval); } if ($error) { - &Apache::lonxml::error('
Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running <while$gt; on line '.$line.'
'); + &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while$gt; on line').' '.$line.'
'); } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -931,6 +939,8 @@ sub start_part { $Apache::lonhomework::problemstatus= &Apache::lonnet::EXT("resource.$id.problemstatus"); my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + my $expression='$external::part='.$Apache::inputtags::part.';'; + &Apache::run::run($expression,$safeeval); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; @@ -947,12 +957,12 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); if ( $target eq "web" ) { - $result="
Part is not open to be viewed. It $accessmsg
"; + $result="
".&mt('Part is not open to be viewed. It')." $accessmsg
"; } elsif ( $target eq 'tex' ) { if (not $ENV{'form.problem_split'}=~/yes/) { - $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + $result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}"; } else { - $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + $result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\"; } } } else { @@ -994,7 +1004,9 @@ sub end_part { } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, $target); - if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} + if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { + $gradestatus=''; + } $result=$gradestatus; } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); @@ -1084,8 +1096,8 @@ sub end_startouttext { if ($target eq 'edit') { $text=&Apache::lonxml::get_all_text("endouttext",$parser); - $result.=&Apache::edit::start_table($token)."Text Block -Delete:". + $result.=&Apache::edit::start_table($token)."".&mt('Text Block')." +".&mt('Delete:'). &Apache::edit::deletelist($target,$token) ." ". @@ -1144,7 +1156,7 @@ sub start_simpleeditbutton { my $url=$ENV{'REQUEST_URI'}; $url=~s/\?.*$//; $result='
'. - 'Simple Problem Editor - Note: it can take up to 10 minutes for changes to take effect for all users.'. + ''.&mt('Simple Problem Editor').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). &Apache::loncommon::help_open_topic('Caching').'

'; } return $result;