--- loncom/interface/lonprintout.pm	2004/04/06 15:47:52	1.289
+++ loncom/interface/lonprintout.pm	2004/04/19 15:39:35	1.291
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.289 2004/04/06 15:47:52 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.291 2004/04/19 15:39:35 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -750,7 +750,7 @@ ENDPART
 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
 		}
 		my %form;
-                if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'exam') {$form{'problemtype'}='exam';}
+                if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
 		$form{'grade_target'}='tex';
 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1371,7 +1371,8 @@ sub printHelper {
     my $helper = Apache::lonhelper::helper->new("Printing Helper");
     $helper->declareVar('symb');
     $helper->declareVar('postdata');    
-    $helper->declareVar('curseed');    
+    $helper->declareVar('curseed'); 
+    $helper->declareVar('probstatus');   
     $helper->declareVar('filename');
     $helper->declareVar('construction');
     $helper->declareVar('assignment');
@@ -1431,6 +1432,9 @@ sub printHelper {
     if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
 	$helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
     }
+    if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) {
+	$helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'};
+    }
 
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
     my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
@@ -1462,11 +1466,9 @@ sub printHelper {
     my $paramHash;
 
     if ($resourceTitle) {
-        push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+        push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
     }
 
-#    $r->print($helper->{VARS}->{'postdata'});
-
     # Useful filter strings
     my $isProblem = '($res->is_problem()||$res->contains_problem) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1488,9 +1490,9 @@ sub printHelper {
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["<b>Problems</b> in <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["<b>Resources</b> in <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
@@ -1537,8 +1539,8 @@ HELPERFRAGMENT
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
-	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>anonymous students</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 	my $resource_selector=<<RESOURCE_SELECTOR;
    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
@@ -1584,8 +1586,8 @@ CHOOSE_ANON1
 
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
-	    push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>anonymous students</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
@@ -1627,7 +1629,7 @@ CHOOSE_ANON2
 
     # FIXME: That RE should come from a library somewhere.
     if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne '/home/httpd/html/res/') {    
-        push @{$printChoices}, ["<b>Problems</b> from current subdirectory <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
@@ -1758,7 +1760,7 @@ CHOOSE_FROM_ANY_SEQUENCE
 	if ($helper->{'VARS'}->{'construction'}) { 
 	    my $stylevalue=$ENV{'construct.style'};
 	    my $xmlfrag .= <<"RNDSEED";
-	    <message><tr><td align='right'>Use random seed: </td><td></message>
+	    <message><tr><td align='right'>Use random seed:  </td><td></message>
 	    <string variable="curseed" size="15" maxlength="15">
 		<defaultvalue>
 	            return $helper->{VARS}->{'curseed'};