--- loncom/interface/printout.pl	2011/12/21 21:25:40	1.151
+++ loncom/interface/printout.pl	2013/03/18 21:33:08	1.154
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.151 2011/12/21 21:25:40 www Exp $
+# $Id: printout.pl,v 1.154 2013/03/18 21:33:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,8 +127,8 @@ sub send_error_mail {
 
 	    # Todo: Convert badurl into a url from file path:
 
-	    my $subject  = "Error [$badurl] Print failed for $user".'@'.$domain;
-	    my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";
+	    my $subject  = "Error [$badurl] Print failed for $user".':'.$domain;
+	    my $message .= "Print failed to render LaTeX for $user".':'."$domain\n";
 	    $message    .= "  User was attempting to print: \n";
 	    foreach my $resource (split(/:/,$resources)) {
 		$message    .= "       $resource\n";
@@ -308,14 +308,14 @@ foreach $texfile (@texfile) {
   my $name;
   my $name_range='';
 
-  # $name       -> Either user's full name or username@domain
+  # $name       -> Either user's full name or username:domain
   # $name_range -> Either user's last name or usrname.
 
   if ($tempo_array[3]) {
       $name=$tempo_array[3];
       ($name_range) = split(/,/,$name, 2);
   } else {
-      $name=$tempo_array[0].'@'.$tempo_array[1];
+      $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];
   }
 
@@ -323,7 +323,7 @@ foreach $texfile (@texfile) {
   # user is getting printed.
   #
 
-  if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
+  if (($name ne "") && ($name ne ':') ) { # Could be printing codes...
       $link_text='<b>'.$name.'</b>';
       $status_statement.=$name;
   }
@@ -339,10 +339,10 @@ foreach $texfile (@texfile) {
 	  my ($lastname) = split(/,/, $name,2);
 	  $name_range .= "-".$lastname;
       } else {
-	  $name=$tempo_array[0].'@'.$tempo_array[1];
+	  $name=$tempo_array[0].':'.$tempo_array[1];
 	  $name_range .= '-'.$tempo_array[0];
       }
-      if (($name ne "") && ($name ne '@')) {
+      if (($name ne "") && ($name ne ':')) {
 	  $link_text.=' - <b>'.$name.'</b>';
 	  $status_statement.=' -  '.$name;
   
@@ -553,14 +553,21 @@ foreach $texfile (@texfile) {
 	      my @garb = ($texlog,$texaux,$texdvi,$texps);
 #	  unlink @garb;
 	      unlink($duefile);
-	      print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";
-	      print "\n";
+	      print
+                  '<p>'
+                 .&mt('[_1] - [_2]Your PDF file[_3] is ready for download.',
+                      $link_text,'<a href="/prtspool/'.$pdf_file.'">','</a>')
+                 .'</p>'."\n";
 	  }
 	  unlink($missfonts_file);
 
       }  
   } else {
-      print "LaTeX file $texfile was not created successfully";
+      print
+          '<p class="LC_error">'
+         .&mt('The LaTeX file [_1] was not created successfully.',
+              '<span class="LC_filename">'.$texfile.'</span>')
+         .'</p>';
   }
 }
 print "<br />";
@@ -572,11 +579,15 @@ if ($number_of_files>1) {
 	$file=~s/\.tex/.\pdf/;
 	$statement.=' '.$file; 
     }
-    print("<pre>Zip Output:\n");
+    print('<p>'.&mt('Zip Output:')."\n<pre>\n");
     system($statement);
-    print("</pre>");
+    print("</pre></p>\n");
     $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
-    print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
+    print
+        '<p>'
+       .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
+            '<a href="'.$zipfile.'">','</a>')
+       .'</p>';
 }
 if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
 print(&Apache::loncommon::end_page());
@@ -614,7 +625,7 @@ sub busy_wait_command {
 	    if ($size == $last_size) {
 		$unchanged_time++;
 		if ($timeout && ($unchanged_time > $timeout)) {
-		    print "<h1>Operation timed out!</h1>\n";
+		    print '<p class="LC_error">'.&mt('Operation timed out!')."</p>\n";
 		    print "<p>Executing $command, the output file $output_file did not grow\n";
 		    print "after $timeout seconds.  This <em>may</em> indicate $command\n";
 		    print "is in an infinite loop.\n";