--- loncom/homework/imagechoice.pm	2008/10/13 14:06:47	1.15
+++ loncom/homework/imagechoice.pm	2014/02/14 17:01:30	1.18
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.15 2008/10/13 14:06:47 bisitz Exp $
+# $Id: imagechoice.pm,v 1.18 2014/02/14 17:01:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,7 @@ use LONCAPA;
 
 sub deletedata {
     my ($id)=@_;
-    &Apache::lonnet::delenv("imagechoice\\.$id\\.coords");
+    &Apache::lonnet::delenv('imagechoice.'.$id.'.coords');
 }
 
 sub closewindow {
@@ -59,13 +59,12 @@ ENDSUBM
     my $end_page =
         &Apache::loncommon::end_page();
 
-    $r->print(<<"ENDSUBM");
-$start_page
-<h3>Position Selected</h3>
-$display
-$needimage
-$end_page
-ENDSUBM
+    $r->print(
+        $start_page
+       .'<h1>'.&mt('Position Selected').'</h1>'
+      .$display
+      .$needimage
+      .$end_page);
 }
 
 sub storedata {
@@ -89,11 +88,11 @@ sub storedata {
 	my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"});
 	if ($env{"imagechoice.$id.formx"}) {
 	    $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';';
-	    $display.="<p>The X coordinate is $x</p>\n";
+	    $display.='<p>'.&mt('The X coordinate is [_1]',$x)."</p>\n";
 	}
 	if ($env{"imagechoice.$id.formy"}) {
 	    $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';';
-	    $display.="<p>The Y coordinate is $y</p>\n";
+	    $display.='<p>'.&mt('The Y coordinate is [_1]',$y)."</p>\n";
 	}
     } elsif ($type eq 'polygon' or $type eq 'box') {
 	my $coordstr;
@@ -101,11 +100,13 @@ sub storedata {
 	    $coordstr.='('.shift(@coords).','.shift(@coords).')-';
 	}
 	chop($coordstr);
-	$display.="<p>The selected coordinates are <tt>$coordstr</tt></p>\n";
+	$display.='<p>'.&mt('The selected coordinates are [_1]',"<tt>$coordstr</tt>")."</p>\n";
 	$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
     }
     if ($display) {
-	$display.="<p>If this window fails to close you may need to manually replace the old coordinates with the above value.</p>\n";
+        $display.='<p class="LC_info">'
+                 .&mt('If this window fails to close you may need to manually replace the old coordinates with the above value.')
+                 ."</p>\n";
     }
     &deletedata($id);
     &closewindow($r,$output,$filename,$needimage,$display);
@@ -119,35 +120,39 @@ sub getcoord {
 	my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
 	my $step=scalar(@coords)/2;
 	if ($step == 0) { 
-	    $heading=&mt('Select First Coordinate on Image');
+	    $heading=&mt('Select First Coordinate on Image.');
 	    #$nextstage='<input type="hidden" name="type" value="pairtwo" />';
 	} elsif ($step == 1) {
-	    $heading=&mt('Select Second Coordinate on Image');
+	    $heading=&mt('Select Second Coordinate on Image.');
 	    #$nextstage='<input type="hidden" name="type" value="pairthree" />';
 	} else {
-	    $heading=&mt('Select Finish to save selection');
-	    $nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
+	    $heading=&mt('Select [_1] to save selection.','"'.&mt('Save').'"');
+	    $nextstage='<input type="submit" name="finish" value="'.&mt('Save').'" />';
 	}
     } elsif ($type eq 'polygon') {
-	$heading=&mt('Enter Coordinate or click finish to close Polygon');
-	$nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
+	$heading=&mt('Click to select a Coordinate or click [_1] to close Polygon.',
+                         '"'.&mt('Save').'"');
+	$nextstage='<input type="submit" name="finish" value="'.&mt('Save').'" />';
     } elsif ($type eq 'point') {
-	$heading=&mt('Click to select a Coordinate or click Finish to save current selection');
-	$nextstage='<input type="submit" name="finish" value="'.&mt('Finish').'" />';
+	$heading=&mt('Click to select a Coordinate or click [_1] to save current selection.',
+                         '"'.&mt('Save').'"');
+	$nextstage='<input type="submit" name="finish" value="'.&mt('Save').'" />';
     }
 
+    my $headline = 'Get Coordinates';
     my $start_page =
-        &Apache::loncommon::start_page('Get Coordinates',undef,
+        &Apache::loncommon::start_page($headline,undef,
 				       {'bgcolor'     => '#FFFFFF',
 					'only_body'   => 1,});
-
     my $end_page =
         &Apache::loncommon::end_page();
+    $headline = &mt($headline);
     my $canceltext=&mt('Cancel');
     $r->print(<<"END");
 $start_page
-<h3>$heading</h3>
-<form method="POST" action="/adm/imagechoice?token=$id">
+<h1>$headline</h1>
+<p>$heading</p>
+<form method="post" action="/adm/imagechoice?token=$id">
 $nextstage
 <input type="submit" name="cancel" value="$canceltext" />
 <br />
@@ -251,7 +256,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 &mt('Cancel')) {
+    if ($env{'form.cancel'}) { # eq &mt('Cancel')) {
 	&deletedata($id);
 	&closewindow($r,'',$filename);
 	return OK;
@@ -260,7 +265,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 &mt('Finish')) {
+    if ($env{'form.finish'}) { # eq &mt('Save')) {
 	&storedata($r,$type,$imurl,$id);
     } else {
 	&getcoord($r,$type,$imurl,$id);