--- loncom/homework/bridgetask.pm 2007/08/09 01:05:15 1.238 +++ loncom/homework/bridgetask.pm 2008/08/13 09:10:44 1.239 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.238 2007/08/09 01:05:15 albertel Exp $ +# $Id: bridgetask.pm,v 1.239 2008/08/13 09:10:44 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -252,10 +252,10 @@ sub add_grading_button { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); $result.="\n\t".''."\n\t\t".''; if ($see_all || (!§ion_restricted())) { - $result.="\n\t\t\t".''. + $result.="\n\t\t\t".''. "\n\t\t\t".''; } else { - $result.="\n\t\t\t".''. + $result.="\n\t\t\t".''. "\n\t\t\t".''; } $result.="\n\t\t\t".'"; } - $result.="". + if ($with_selects) { $result.=''; } + $result.=''. &Apache::loncommon::end_data_table_header_row(); foreach my $key (sort(keys(%queue))) { my ($symb,$uname,$udom) = &decode_queue_key($key); @@ -1644,7 +1649,7 @@ sub show_queue { 'start'); } my $me=$env{'user.name'}.':'.$env{'user.domain'}; - $status=&mt('Locked by [_1] [_2]',$locker,$time); + $status=&mt('Locked by [_1] [_2]',''.$locker.'',$time); if ($me eq $locker) { ($action,$description)=('resume',&mt('Resume')); } else { @@ -1679,9 +1684,11 @@ FORM } $result.= ""; - $result.='".&Apache::loncommon::end_data_table_row(); + $result.='' + .&Apache::loncommon::end_data_table_row(); } } $result.= &Apache::loncommon::end_data_table()."
\n"; @@ -2034,8 +2041,10 @@ sub select_user { my $result; if (!(grep(/^all$/,@chosen_sections))) { - $result.='

Showing only sections '.join(', ',@chosen_sections). - '.

'."\n"; + $result.='

' + .&mt('Showing only sections [_1].' + ,''.join(', ',@chosen_sections).'') + .'

'."\n"; } $result.=&Apache::loncommon::start_data_table(); @@ -2432,10 +2441,14 @@ sub end_Dimension { ('sub' x $dimension{$dim}{'depth'}).'question'; $ucquestion =~ s/^(.)/uc($1)/e; if ($dim_status eq 'pass') { - $dim_info.='

'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'

'; + $dim_info.='

'.$ucquestion.' : ' + .&mt('you passed this [_1] [_2]',$mandatory,$question) + .'

'; } if ($dim_status eq 'fail') { - $dim_info.='

'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'

'; + $dim_info.='

'.$ucquestion.' : ' + .&mt('you did not pass this [_1] [_2]',$mandatory,$question) + .'

'; } my %counts = &get_counts($dim,$instance,$parstack, $safeeval); @@ -2634,6 +2647,7 @@ sub question_status_message { } $status .= '.'; if ($counts->{'opt'}) { + # FIXME &mt() missing! $status .= ' You were required to pass '.$counts->{'opt_req'}. ' optional '; if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) { @@ -3118,13 +3132,14 @@ sub proctor_validation_screen { } if (!$valid) { $msg.='

' - .&mt("No valid poctors are defined.") + .&mt("No valid proctors are defined.") .'

'; } if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; } my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); $uri = &HTML::Entities::encode($uri,'<>&"'); + # FIXME &mt() missing! my $result= (<Proctor Validation

Your room's proctor needs to validate your access to this resource.

Specify a section: '.&mt('Specify a section:').' '.$sec_select."\n\t\t\t".'Grading section: '.&mt('Grading section:').' '.$env{'request.course.sec'}."\n\t\t\t".''.' Will be next available: $description

-STUFF + $result.='

' + .&mt('Will be next available:') + .' '.$description + .'

'; } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } @@ -322,7 +323,7 @@ STUFF ''."\n\t\t". ''."\n\t\t". ''."\n\t". + $text.'" />'."\n\t". ''."\n"; return $result; } @@ -540,17 +541,19 @@ sub done_screen { foreach my $file (@files) { my $url="/uploaded/$domain/$user/portfolio$file"; if (! &Apache::lonnet::stat_file($url)) { - $file = &mt(' Nonexistent file: '. - '[_1]',$file); - $msg .= "

Submitted non-existant file $file

\n"; + $file = '' + .&mt('[_1]Nonexistent file:[_2]' + ,' ' + ,' '.$file.''); + $msg .= "

".&mt('Submitted non-existant file [_1]',$file)."

\n"; } else { $file = ''.$file.''; - $msg .= "

Submitted file $file

\n"; + $msg .= "

".&mt('Submitted file [_1]',$file)."

\n"; } $files .= '
  • '.$file.'
    • '; } $files.=''; - my $subject = "Submission message for $title"; + my $subject = &mt('Submission message for [_1]',$title); my ($message_status,$comment_status); my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; $setting =~ s/^\s*(\S*)\s*$/$1/; @@ -569,16 +572,14 @@ sub done_screen { $comment_status = '

    '.&mt('Message sent to instructor: [_1]', $comment_status).'

    '; } - return <$title -

    Files submitted: $files

    -

    You are now done with this Bridge Task

    -
    -

    Logout

    -

    Change to a different course

    -$message_status -$comment_status -DONESCREEN + return "

    $title

    " + .'

    '.&mt('Files submitted: [_1]',$files).'

    ' + .'

    '.&mt('You are now done with this Bridge Task').'

    ' + .'
    ' + .'

    '.&mt('Logout').'

    ' +.'

    '.&mt('Change to a different course').'

    ' +.$message_status +.$comment_status } @@ -1126,13 +1127,15 @@ DONEBUTTON "

    \n"; if ($bt_status eq 'pass') { - $status.='

    You passed the '.$title.' given on '. - $start_time.'

    '; + $status.='

    ' + .&mt('You passed the [_1] given on [_2].',$title,$start_time) + .'

    '; $status.=$question_status; } if ($bt_status eq 'fail') { - $status.='

    You did not pass the '.$title.' given on '. - $start_time.'

    '; + $status.='

    ' + .&mt('You did not pass the [_1] given on [_2].',$title,$start_time) + .'

    '; $status.=$question_status; if (!$previous) { $status.=&add_request_another_attempt_button(); @@ -1561,8 +1564,10 @@ sub show_queue { my $classlist = &get_limited_classlist(\@chosen_sections); if (!(grep(/^all$/,@chosen_sections))) { - $result.='

    Showing only sections '.join(', ',@chosen_sections). - '.

    '."\n"; + $result.='

    ' + .&mt('Showing only sections [_1].' + ,''.join(', ',@chosen_sections).'') + ."

    \n"; } my ($view,$view_section); @@ -1579,7 +1584,7 @@ sub show_queue { $result .= '

    '. &mt('Return to resource').'

    '. - "\n

    Current Queue - $queue

    "; + "\n

    ".&mt('Current Queue - [_1]',$queue)."

    "; my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -1596,8 +1601,8 @@ sub show_queue { $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); - if ($with_selects) { $result.="    		Statususerdata'.&mt('Status').''.&mt('User').''.&mt('Data').'".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()]. " ($uname:$udom) '.$slot_text.' End time: '. - &Apache::lonlocal::locallocaltime($end_time). - "'.$slot_text.' ' + .&mt('End time: [_1]' + ,&Apache::lonlocal::locallocaltime($end_time)) + .'