[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

[albertel]

albertel		Sat Jan 13 01:11:19 2007 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - some tweaks to the english of a graded task.
  
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.218 loncom/homework/bridgetask.pm:1.219
--- loncom/homework/bridgetask.pm:1.218	Thu Jan 11 14:01:38 2007
+++ loncom/homework/bridgetask.pm	Sat Jan 13 01:11:17 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.218 2007/01/11 19:01:38 albertel Exp $
+# $Id: bridgetask.pm,v 1.219 2007/01/13 06:11:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2486,7 +2486,15 @@
     $status .= '.';
     if ($counts->{'opt'}) {
 	$status .= ' You were required to pass '.$counts->{'opt_req'}.
-	    ' optional component'.($counts->{'opt_req'} == 1?'':'s');
+	    'optional ';
+	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+	    $status .=
+		' component'.($counts->{'opt_req'} == 1?'':'s');
+	} else {
+	    $status .=
+		($counts->{'opt_req'} == 1?'criterion':'criteria');
+	}
+	$status .= '.';
     }
     return $status;
 }