--- loncom/homework/imagechoice.pm	2006/05/30 12:45:37	1.11
+++ loncom/homework/imagechoice.pm	2009/02/18 07:06:12	1.16
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.11 2006/05/30 12:45:37 www Exp $
+# $Id: imagechoice.pm,v 1.16 2009/02/18 07:06:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,13 +26,13 @@ package Apache::imagechoice;
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
+use Apache::lonlocal;
 use LONCAPA;
  
 
 sub deletedata {
     my ($id)=@_;
-    &Apache::lonnet::delenv("imagechoice\\.$id\\.coords");
+    &Apache::lonnet::delenv('imagechoice.'.$id.'.coords');
 }
 
 sub closewindow {
@@ -59,7 +59,7 @@ ENDSUBM
     my $end_page =
         &Apache::loncommon::end_page();
 
-    my $js=<<"ENDSUBM";
+    $r->print(<<"ENDSUBM");
 $start_page
 <h3>Position Selected</h3>
 $display
@@ -113,27 +113,27 @@ sub storedata {
 
 sub getcoord {
     my ($r,$type,$filename,$id)=@_;
-    my $heading='Select Position on Image';
+    my $heading=&mt('Select Position on Image');
     my $nextstage='';
     if ($type eq 'box') {
 	my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
 	my $step=scalar(@coords)/2;
 	if ($step == 0) { 
-	    $heading='Select First Coordinate on Image';
+	    $heading=&mt('Select First Coordinate on Image');
 	    #$nextstage='<input type="hidden" name="type" value="pairtwo" />';
 	} elsif ($step == 1) {
-	    $heading='Select Second Coordinate on Image';
+	    $heading=&mt('Select Second Coordinate on Image');
 	    #$nextstage='<input type="hidden" name="type" value="pairthree" />';
 	} else {
-	    $heading='Select Finish to store selection.';
-	    $nextstage='<input type="submit" name="finish" value="Finish" />';
+	    $heading=&mt('Select Finish to save selection');
+	    $nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
 	}
     } elsif ($type eq 'polygon') {
-	$heading='Enter Coordinate or click finish to close Polygon';
-	$nextstage='<input type="submit" name="finish" value="Finish" />';
+	$heading=&mt('Enter Coordinate or click finish to close Polygon');
+	$nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
     } elsif ($type eq 'point') {
-	$heading='Click to select a Coordinate or click Finish to store current selection.';
-	$nextstage='<input type="submit" name="finish" value="Finish" />';
+	$heading=&mt('Click to select a Coordinate or click Finish to save current selection');
+	$nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
     }
 
     my $start_page =
@@ -143,12 +143,13 @@ sub getcoord {
 
     my $end_page =
         &Apache::loncommon::end_page();
+    my $canceltext=&mt('Cancel');
     $r->print(<<"END");
 $start_page
 <h3>$heading</h3>
 <form method="POST" action="/adm/imagechoice?token=$id">
 $nextstage
-<input type="submit" name="cancel" value="Cancel" />
+<input type="submit" name="cancel" value="$canceltext" />
 <br />
 <input name="image" type="image" src="$filename" />
 </form>
@@ -166,7 +167,7 @@ sub savecoord {
 	    $data=join(':',($env{"imagechoice.$id.coords"},
 			    $env{"form.image.x"},$env{"form.image.y"}));
 	}
-	&Apache::lonnet::appenv("imagechoice.$id.coords"=>$data);
+	&Apache::lonnet::appenv({"imagechoice.$id.coords"=>$data});
     }
     return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2);
 }
@@ -238,7 +239,7 @@ sub drawimage {
     &drawX(\%data,$imid,$x,$y);
     if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); }
     if ($type eq "box") { &drawBox(\%data,$id,$imid); }
-    &Apache::lonnet::appenv(%data);
+    &Apache::lonnet::appenv(\%data);
     return "/adm/randomlabel.png?token=$imid"
 }
 
@@ -250,7 +251,7 @@ sub handler {
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
     my $filename = &unescape($env{"imagechoice.$id.file"});
     my $formname = $env{"imagechoice.$id.formname"};
-    if ($env{'form.cancel'} eq 'Cancel') {
+    if ($env{'form.cancel'} eq &mt('Cancel')) {
 	&deletedata($id);
 	&closewindow($r,'',$filename);
 	return OK;
@@ -259,7 +260,7 @@ sub handler {
     if (defined($env{'form.type'})) { $type=$env{'form.type'}; }
     my $numcoords=&savecoord($id,$type);
     my $imurl=&drawimage($r,$type,$filename,$id);
-    if (($env{'form.finish'} eq 'Finish')) {
+    if ($env{'form.finish'} eq &mt('Finish')) {
 	&storedata($r,$type,$imurl,$id);
     } else {
 	&getcoord($r,$type,$imurl,$id);