--- loncom/interface/loncommon.pm 2013/03/20 01:26:15 1.1118
+++ loncom/interface/loncommon.pm 2013/04/11 14:59:48 1.1120
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1118 2013/03/20 01:26:15 raeburn Exp $
+# $Id: loncommon.pm,v 1.1120 2013/04/11 14:59:48 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6729,7 +6729,7 @@ ul#LC_secondary_menu li ul li {
vertical-align: top;
border-left: 1px solid black;
border-right: 1px solid black;
- background-color: $data_table_light
+ background-color: $data_table_light;
list-style:none;
float: none;
}
@@ -10123,7 +10123,7 @@ sub upload_embedded {
$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'
';
next;
} elsif ($fname=~/\.(\d+)\.(\w+)$/) {
- $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'
';
+ $output .= &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'
';
next;
}
$env{'form.embedded_item_'.$i.'.filename'}=$fname;
@@ -10825,8 +10825,8 @@ sub process_decompression {
my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;
my ($dir,$error,$warning,$output);
if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
- $error = &mt('File name not a supported archive file type.').
- '
'.&mt('File name should end with one of: [_1].',
+ $error = &mt('Filename not a supported archive file type.').
+ '
'.&mt('Filename should end with one of: [_1].',
'.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz');
} else {
my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);