--- loncom/publisher/lonupload.pm 2008/11/20 16:32:34 1.41 +++ loncom/publisher/lonupload.pm 2009/03/26 16:50:12 1.44 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.41 2008/11/20 16:32:34 bisitz Exp $ +# $Id: lonupload.pm,v 1.44 2009/03/26 16:50:12 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -290,8 +290,8 @@ sub check_extension { if ($fn=~/\.(\w+)$/ && (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $result .= &mt('File [_1] could not be copied.', - '

'.$fn.' '). - ''. + ''.$fn.' '). + '

'. &mt('The extension on this file is reserved internally by LON-CAPA.'). '

'; } elsif ($fn=~/\.(\w+)$/ && @@ -421,7 +421,7 @@ function verifyForm() { my $fn; if ($env{'form.filename'}) { $fn=$env{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^https?\:\/\/[^\/]+\///; $fn=~s/^\///; $fn=~s{(~|priv/)($LONCAPA::username_re)}{}; $fn=~s/\/+/\//g; @@ -444,8 +444,10 @@ function verifyForm() { $javascript)); if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { - $r->print('

'.&mt('Co-Author').': '.$uname. - &mt(' at ').$udom.'

'); + $r->print('

' + .&mt('Co-Author [_1]:[_2]',$uname,$udom) + .'

' + ); } if ($env{'form.phase'} eq 'three') {