--- loncom/interface/coursecatalog.pm 2008/07/17 12:00:28 1.41 +++ loncom/interface/coursecatalog.pm 2008/09/23 20:31:09 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.41 2008/07/17 12:00:28 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.44 2008/09/23 20:31:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -398,6 +398,7 @@ sub cat_header { sub category_breadcrumbs { my ($dom,@cats) = @_; + my $crumbsymbol = ' ▶ '; my ($currdepth,$deeper) = &get_depth_values(); my $currcat_str = ''; my $catlinks = ''.&mt('Catalog:').''; @@ -412,7 +413,7 @@ sub category_breadcrumbs { my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); $cattitle = $cat; } - $catlinks .= ''; + $catlinks .= ''; } if ($deeper == 0) { $catlinks .= ''. ''. - ''; + ''; } else { $output .= ''; } @@ -957,10 +958,10 @@ sub build_courseinfo_hash { } } if ($startaccess) { - $accessdates .= &mt('From: ').$startaccess.'
'; + $accessdates .= ''.&mt('From:[_1]',' '.$startaccess).'
'; } if ($endaccess) { - $accessdates .= &mt('To: ').$endaccess.'
'; + $accessdates .= ''.&mt('To:[_1]',' '.$endaccess).'
'; } if (($selfenroll_types ne '') && ($selfenroll_end > 0 && $selfenroll_end > $now)) { @@ -981,10 +982,10 @@ sub build_courseinfo_hash { if ($selfenroll_start_access || $selfenroll_end_access) { $accessdates .= '

'.&mt('Self-enrollers:').'
'; if ($selfenroll_start_access) { - $accessdates .= &mt('From: ').$selfenroll_start_access.'
'; + $accessdates .= ''.&mt('From:[_1]',' '.$selfenroll_start_access).'
'; } if ($selfenroll_end_access) { - $accessdates .= &mt('To: ').$selfenroll_end_access.'
'; + $accessdates .= ''.&mt('To:[_1]',' '.$selfenroll_end_access).'
'; } } } @@ -1019,10 +1020,10 @@ sub count_students { $student_count{$data->[$idx{'status'}]} ++; } - my $countslist = &mt('[quant,_1,section]',$numsec).':
'; + my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'
'; foreach my $status ('Active','Future') { - $countslist .= ''.$status_title{$status}.': '. - $student_count{$status}.'
'; + $countslist .= ''.$status_title{$status}.': '. + $student_count{$status}.'
'; } return $countslist; } @@ -1162,11 +1163,11 @@ sub get_valid_classes { } if ($totalitems > 0) { if (@{$validations{'sections'}}) { - $response = &mt('Sections: '). + $response = &mt('Sections:').' '. join(', ',@{$validations{'sections'}}).'
'; } if (@{$validations{'xlists'}}) { - $response .= &mt('Courses: '). + $response .= &mt('Courses:').' '. join(', ',@{$validations{'xlists'}}); } } @@ -1331,17 +1332,20 @@ sub autoenroll_info { &get_valid_classes($seclist,$xlist_items,$code, $owners,$cdom,$cnum); if ($valid_classes ne '') { - $autoenrolldates = &mt('Not enabled
Starts: '). - $autostart.'
'.$valid_classes; } + $autoenrolldates = &mt('Not enabled').'
' + .&mt('Starts: [_1]',$autostart) + .'
'.$valid_classes; + } } } else { if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) { - $autoenrolldates = &mt('Not enabled
Ended: ').$autoend; + $autoenrolldates = &mt('Not enabled').'
' + .&mt('Ended: [_1]',$autoend); } else { my $valid_classes = &get_valid_classes($seclist,$xlist_items, $code,$owners,$cdom,$cnum); if ($valid_classes ne '') { - $autoenrolldates = &mt('Currently enabled
'). + $autoenrolldates = &mt('Currently enabled').'
'. $valid_classes; } }
'.$cattitle.'->'.$cattitle.''.$crumbsymbol.''.&mt('Main Categories').': '; @@ -810,7 +811,7 @@ sub construct_data_table { $output .= ''.&mt('Default Access Dates for Students').''.&mt('Student Counts').''.&mt('Auto-enrollment of
registered students').'
'.&mt('Auto-enrollment of[_1]registered students','
').'
'.&mt('Details').'