--- loncom/homework/imagechoice.pm 2006/04/13 18:49:29 1.10 +++ loncom/homework/imagechoice.pm 2014/02/14 17:01:30 1.18 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.10 2006/04/13 18:49:29 albertel Exp $ +# $Id: imagechoice.pm,v 1.18 2014/02/14 17:01:30 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,10 +26,13 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; +use Apache::lonlocal; +use LONCAPA; + sub deletedata { my ($id)=@_; - &Apache::lonnet::delenv("imagechoice\\.$id\\.coords"); + &Apache::lonnet::delenv('imagechoice.'.$id.'.coords'); } sub closewindow { @@ -56,13 +59,12 @@ ENDSUBM my $end_page = &Apache::loncommon::end_page(); - my $js=<<"ENDSUBM"; -$start_page -
The X coordinate is $x
\n"; + $display.=''.&mt('The X coordinate is [_1]',$x)."
\n"; } if ($env{"imagechoice.$id.formy"}) { $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';'; - $display.="The Y coordinate is $y
\n"; + $display.=''.&mt('The Y coordinate is [_1]',$y)."
\n"; } } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; @@ -98,11 +100,13 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $display.="The selected coordinates are $coordstr
\n"; + $display.=''.&mt('The selected coordinates are [_1]',"$coordstr")."
\n"; $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } if ($display) { - $display.="If this window fails to close you may need to manually replace the old coordinates with the above value.
\n"; + $display.='' + .&mt('If this window fails to close you may need to manually replace the old coordinates with the above value.') + ."
\n"; } &deletedata($id); &closewindow($r,$output,$filename,$needimage,$display); @@ -110,42 +114,47 @@ 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=''; } elsif ($step == 1) { - $heading='Select Second Coordinate on Image'; + $heading=&mt('Select Second Coordinate on Image.'); #$nextstage=''; } else { - $heading='Select Finish to store selection.'; - $nextstage=''; + $heading=&mt('Select [_1] to save selection.','"'.&mt('Save').'"'); + $nextstage=''; } } elsif ($type eq 'polygon') { - $heading='Enter Coordinate or click finish to close Polygon'; - $nextstage=''; + $heading=&mt('Click to select a Coordinate or click [_1] to close Polygon.', + '"'.&mt('Save').'"'); + $nextstage=''; } elsif ($type eq 'point') { - $heading='Click to select a Coordinate or click Finish to store current selection.'; - $nextstage=''; + $heading=&mt('Click to select a Coordinate or click [_1] to save current selection.', + '"'.&mt('Save').'"'); + $nextstage=''; } + 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 -