--- loncom/publisher/loncfile.pm 2010/04/13 22:28:42 1.100.2.4 +++ loncom/publisher/loncfile.pm 2009/05/28 17:08:38 1.101 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.100.2.4 2010/04/13 22:28:42 raeburn Exp $ +# $Id: loncfile.pm,v 1.101 2009/05/28 17:08:38 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -363,14 +363,14 @@ sub cleanDest { if (! -d "$newpath") { $request->print('
' .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name." - ,&display($newpath)) + ,''.&display($newpath).'') .'
'); $dest=~s|.*/||; } } if ($dest =~ /\.(\d+)\.(\w+)$/){ $request->print(''
- .&mt('Bad filename [_1]',&display($dest))
+ .&mt('Bad filename [_1]',''.&display($dest).'')
.' '
- .&mt($action.' [_1] to [_2]?',
- &display($fn),
- &display($newfilename))
+ .&mt($action.' [_1] to [_2]?'
+ ,&display($fn),&display($newfilename))
.' '
- .&mt('No such file: [_1]',
- &display($fn))
+ .&mt('No such file: [_1]'
+ ,''.&display($fn).'')
.' '
- .&mt('Delete [_1]?',
- &display($fn))
+ .&mt('Delete [_1]?'
+ ,''.&display($fn).'')
.' '
- .&mt('No such file: [_1]',
- &display($fn))
+ .&mt('No such file: [_1]'
+ ,''.&display($fn).'')
.' '
- .&mt('Copy [_1] to [_2]?',
- &display($fn),
- &display($newfilename))
- .' '
+ .&mt('Copy [_1] to [_2]?'
+ ,''.&display($fn).''
+ ,''.&display($newfilename).'')
+ .' '
- .&mt('No such file: [_1]',
- &display($fn))
+ .&mt('No such file: [_1]'
+ ,''.&display($fn).'')
.' '
- .&mt('Make new directory [_1]?',
- &display($newfilename))
+ .&mt('Make new directory [_1]?'
+ ,''.&display($newfilename).'')
.' '
- .&mt('Decompress [_1]?',
- &display($fn))
+ .&mt('Decompress [_1]?'
+ ,''.&display($fn).'')
.' '
- .&mt('No such file: [_1]',
- &display($fn))
+ .&mt('No such file: [_1]'
+ ,''.&display($fn).'')
.' '.
@@ -1074,8 +1070,8 @@ sub Rename2 {
}
} else {
$request->print(' '
- .&mt('No such file: [_1]',
- &display($oldfile))
+ .&mt('No such file: [_1]'
+ ,''.&display($oldfile).'')
.'
'
.&mt('[_1](name).(number).(extension)[_2] not allowed.','','')
.'
'
@@ -552,9 +552,8 @@ sub Rename1 {
$request->print(''
.'
'.&mt('Cancel').'');
return;
}
-
- $request->print(
- ''
- .''.&mt('Location').': '.&display($fn).'
');
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {