--- loncom/xml/lonxml.pm	2008/05/28 01:32:59	1.478
+++ 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.478 2008/05/28 01:32:59 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, ".
-	      '<tt>&lt;'.join('&gt;</tt>, <tt>&lt;',reverse(@stack)).
+     &warning(&mt('At end of file some tags were still left unclosed:').
+	      ' <tt>&lt;'.join('&gt;</tt>, <tt>&lt;',reverse(@stack)).
 	      '&gt;</tt>');
  }
  if ($env{'request.uri'}) {
@@ -718,6 +718,7 @@ sub init_safespace {
   $safeeval->permit(":base_math");
   $safeeval->permit("sort");
   $safeeval->permit("time");
+  $safeeval->permit("caller");
   $safeeval->deny("rand");
   $safeeval->deny("srand");
   $safeeval->deny(":base_io");
@@ -737,6 +738,9 @@ sub init_safespace {
   $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
 		  '&capa_formula_fix');
 
+  $safehole->wrap(\&Apache::lonlocal::locallocaltime,$safeeval,
+                  '&locallocaltime');
+
   $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
   $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
   $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
@@ -1080,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;
     }
@@ -1447,7 +1451,7 @@ sub storefile {
         $fh->close();
         return 1;
     } else {
-	&warning("Unable to save file $file");
+	&warning(&mt('Unable to save file [_1]','<tt>'.$file.'</tt>'));
 	return 0;
     }
 }
@@ -1507,17 +1511,17 @@ sub renderingoptions {
     }
     return
        '<span class="LC_nobreak">'.
-       &mt('Language: ').
+       &mt('Language:').' '.
        &Apache::loncommon::select_form($env{'form.languages'},'languages',
                                                      %langchoices).'
      </span>
      <span class="LC_nobreak">'.
-       &mt('Math Rendering: ').
+       &mt('Math Rendering:').' '.
        &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
                                                      ('' => '',
-                                                      'tth' => 'tth',
+                                                      'tth' => 'tth (Tex-to-HTML)',
                                                       'jsMath' => 'jsMath',
-                                                      'mimetex' => 'mimetex')).'
+                                                      'mimetex' => 'mimetex (Convert to Images)')).'
      </span>';
 }
 
@@ -1903,7 +1907,10 @@ sub warning {
 	if ( &show_error_warn_msg() ) {
 	    push(@Apache::lonxml::warning_messages,
 		 $Apache::lonxml::warnings_error_header.
-		 "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
+                 '<span class="LC_warning">'.
+                 &mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)."<br />\n".
+                 '</span>'
+                );
 	    $Apache::lonxml::warnings_error_header='';
 	}
     }