--- loncom/xml/lonxml.pm 2008/06/10 16:20:39 1.480 +++ loncom/xml/lonxml.pm 2008/08/01 16:31:26 1.482 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.480 2008/06/10 16:20:39 www Exp $ +# $Id: lonxml.pm,v 1.482 2008/08/01 16:31:26 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -361,8 +361,8 @@ sub xmlparse { $safeeval,\%style_for_target,1); if (@stack) { - &warning("At end of file some tags were still left unclosed, ". - '<'.join('>, <',reverse(@stack)). + &warning(&mt('At end of file some tags were still left unclosed:'). + ' <'.join('>, <',reverse(@stack)). '>'); } if ($env{'request.uri'}) { @@ -1084,7 +1084,7 @@ Optional Arguments: sub increment_counter { my ($increment, $part_response) = @_; - if ($env{'form.grade_target'} eq 'analyze') { return; } + if ($env{'form.grade_noincrement'}) { return; } if (!defined($increment) || $increment le 0) { $increment = 1; } @@ -1451,7 +1451,7 @@ sub storefile { $fh->close(); return 1; } else { - &warning("Unable to save file $file"); + &warning(&mt('Unable to save file [_1]',''.$file.'')); return 0; } } @@ -1907,7 +1907,10 @@ sub warning { if ( &show_error_warn_msg() ) { push(@Apache::lonxml::warning_messages, $Apache::lonxml::warnings_error_header. - "WARNING:".join('
',@_)."
\n"); + ''. + &mt('[_1]W[_2]ARNING','','').": ".join('
',@_)."
\n". + '
' + ); $Apache::lonxml::warnings_error_header=''; } }