--- loncom/publisher/lonretrieve.pm 2008/11/10 14:11:08 1.35 +++ loncom/publisher/lonretrieve.pm 2008/11/20 18:03:55 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.35 2008/11/10 14:11:08 jms Exp $ +# $Id: lonretrieve.pm,v 1.36 2008/11/20 18:03:55 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -192,18 +192,19 @@ sub phaseone { $r->print(&Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). '
'.''. - &mt('Retrieval of an old version will overwrite the file currently in construction space').'
'); + &mt('Retrieval of an old version will overwrite the file currently in construction space.').''); if (!$is_meta) { $r->print(''.''. - &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.'). + &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.'). '
'); } $r->print(''); } else { - $r->print(''.&mt('No previous versions published.').'
'); } - $r->print(''); + $r->print('' + .&mt('Back to [_1]',''.$fn.'') + .'
'); } # ---------------------------------- Interface for presenting specified version @@ -231,25 +232,32 @@ sub phasetwo { if ($is_meta) { $logname =~ s/\.meta$//; } $logname = $ctarget.'.log'; unless ($logfile=Apache::File->new('>>'.$logname)) { - $r->print( - ''.&mt('No write permission to user directory, FAIL').''); + $r->print('' + .&mt('No write permission to user directory, FAIL') + .''); } print $logfile "\n\n================= Retrieve ".localtime()." ================\n". "Version: $version\nSource: $csource\nTarget: $ctarget\n"; $r->print(''.&mt('Copying file').': '); if (copy($csource,$ctarget)) { - $r->print('ok
'); + $r->print('' + .&mt('ok') + .''); print $logfile "Copied sucessfully.\n\n"; } else { my $error=$!; - $r->print('fail, '.$error.'
'); + $r->print('' + .&mt('Copy failed: [_1]',$error) + .''); print $logfile "Copy failed: $error\n\n"; } - $r->print(''.&mt('Back to').' '.$fn.''); + $r->print('
' + .'' + .&mt('Back to [_1]',$fn) + .'
'); } else { - $r->print(''.&mt('Please pick a version to retrieve').''); + $r->print('
'.&mt('Please pick a version to retrieve:').'
'); &phaseone($r,$fn,$uname,$udom); } } @@ -316,7 +324,10 @@ sub handler { $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); - $r->print('