--- loncom/interface/lonnavmaps.pm 2008/01/20 01:52:47 1.410 +++ loncom/interface/lonnavmaps.pm 2009/09/15 01:02:13 1.415.4.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.410 2008/01/20 01:52:47 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.415.4.2 2009/09/15 01:02:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -198,7 +198,7 @@ sub getDescription { return &mt("Not currently assigned."); } if ($status == $res->OPEN_LATER) { - return "Open " .timeToHumanString($open,'start'); + return &mt("Open ") .timeToHumanString($open,'start'); } if ($status == $res->OPEN) { if ($due) { @@ -229,14 +229,18 @@ sub getDescription { return &mt("Excused by instructor"); } if ($status == $res->ATTEMPTED) { - return &mt("Answer submitted, not yet graded"); + if ($res->src() eq '/res/gci/gci/internal/submission.problem') { + return &mt('Question(s) submitted for review'); + } else { + return &mt("Answer submitted, not yet graded"); + } } if ($status == $res->TRIES_LEFT) { my $tries = $res->tries($part); my $maxtries = $res->maxtries($part); my $triesString = ""; if ($tries && $maxtries) { - $triesString = "($tries of $maxtries tries used)"; + $triesString = '('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')'; if ($maxtries > 1 && $maxtries - $tries == 1) { $triesString = "$triesString"; } @@ -249,7 +253,11 @@ sub getDescription { } } if ($status == $res->ANSWER_SUBMITTED) { - return &mt('Answer submitted'); + if ($res->src() eq '/res/gci/gci/internal/submission.problem') { + return &mt('Question(s) submitted for review'); + } else { + return &mt('Answer submitted'); + } } } @@ -854,7 +862,10 @@ sub render_resource { if (!$resource->condval()) { $nonLinkedText .= ' ('.&mt('conditionally hidden').') '; } - + if (($resource->is_practice()) && ($resource->is_raw_problem())) { + $nonLinkedText .=' '.&mt('not graded').''; + } + # We're done preparing and finally ready to start the rendering my $result = "