--- loncom/homework/radiobuttonresponse.pm 2007/10/15 09:47:29 1.129 +++ loncom/homework/radiobuttonresponse.pm 2008/08/08 16:37:13 1.134 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.129 2007/10/15 09:47:29 foxr Exp $ +# $Id: radiobuttonresponse.pm,v 1.134 2008/08/08 16:37:13 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -18,8 +18,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with LON-CAPA; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with LON-CAPA; if not, write to the Free Software# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # /home/httpd/html/adm/gpl.txt # @@ -104,6 +103,7 @@ sub start_radiobuttonresponse { $result .= '\begin{enumerate}'; } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; @@ -250,8 +250,7 @@ sub end_foilgroup { my $part_id="$part.$id"; push (@{ $Apache::lonhomework::analyze{"$part_id.options"} }, ('true','false')); - push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, - $bubble_lines); + } } $Apache::lonxml::post_evaluate=0; @@ -443,7 +442,7 @@ sub whichfoils { } } if (!$havetrue && $Apache::lonhomework::type ne 'survey') { - &Apache::lonxml::error("There are no true statements available.<br />"); + &Apache::lonxml::error(&mt('There are no true statements available.').'<br />'); } } else { my $current=0; @@ -504,7 +503,7 @@ sub whichfoils { my $dosplice=1; if ($notrue && $Apache::lonhomework::type ne 'survey') { $dosplice=0; - &Apache::lonxml::error("There are no true statements available.<br />"); + &Apache::lonxml::error(&mt('There are no true statements available.').'<br />'); } #insert the true statement, keeping track of where it wants to be if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) { @@ -568,9 +567,13 @@ sub displayfoils { $result.='\item \vskip -2 mm '; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';} + if ($target ne 'tex') { + $result.=&mt('Correct:').'<b>'; + } else { + $result.=&mt('Correct:').' \textbf{'; + } } else { - $result.='Incorrect:'; + $result.=&mt('Incorrect:'); } if ($target eq 'web') { $result.="<label>"; } $result.=$Apache::response::foilgroup{$name.'.text'}; @@ -761,11 +764,11 @@ sub end_foil { if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); if ($name eq "") { - &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); $name=$Apache::lonxml::curdepth; } if (defined($Apache::response::foilnames{$name})) { - &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); + &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>')); } $Apache::response::foilnames{$name}++; my $location =&Apache::lonxml::get_param('location',$parstack,