--- loncom/xml/lonxml.pm 2008/08/08 16:50:39 1.484 +++ loncom/xml/lonxml.pm 2008/10/24 19:36:40 1.484.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.484 2008/08/08 16:50:39 bisitz Exp $ +# $Id: lonxml.pm,v 1.484.2.2 2008/10/24 19:36:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -505,11 +505,13 @@ sub inner_xmlparse { if (!$Apache::lonxml::usestyle) { $extras=$Apache::lonxml::style_values; } - if ( $#$parstack > -1 ) { - $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]); - } else { - $result= &Apache::run::evaluate($result,$safeeval,$extras); - } + if ($token->[1] ne 'translated') { + if ( $#$parstack > -1 ) { + $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]); + } else { + $result=&Apache::run::evaluate($result,$safeeval,$extras); + } + } } $Apache::lonxml::post_evaluate=1; @@ -1854,7 +1856,7 @@ sub error { my ($symb)=&Apache::lonnet::symbread(); if ( !$symb ) { #public or browsers - $errormsg=&mt("An error occured while processing this resource. The author has been notified."); + $errormsg=&mt("An error occurred while processing this resource. The author has been notified."); } my $host=$Apache::lonnet::perlvar{'lonHostID'}; push(@errors, @@ -1893,9 +1895,9 @@ sub error { } } if ($env{'request.role.adv'}) { - $errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist)); + $errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist)); } else { - $errormsg=&mt("An error occured while processing this resource. The instructor has been notified."); + $errormsg=&mt("An error occurred while processing this resource. The instructor has been notified."); } } push(@Apache::lonxml::error_messages,"$errormsg
");