[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm
raeburn
raeburn at source.lon-capa.org
Thu Mar 30 19:25:47 EDT 2023
raeburn Thu Mar 30 23:25:47 2023 EDT
Modified files:
/loncom/homework inputtags.pm
Log:
- Bug 5854
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.356 loncom/homework/inputtags.pm:1.357
--- loncom/homework/inputtags.pm:1.356 Sat Feb 4 22:38:31 2023
+++ loncom/homework/inputtags.pm Thu Mar 30 23:25:47 2023
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.356 2023/02/04 22:38:31 raeburn Exp $
+# $Id: inputtags.pm,v 1.357 2023/03/30 23:25:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -659,8 +659,13 @@
$result .= &Apache::lonhtmlcommon::row_title($addfiles);
my $constraints;
if ($uploadedfiletypes ne '*') {
+ my $showtypes = $uploadedfiletypes;
+ if ($showtypes =~ /,/) {
+ my $conjunc = &mt('or');
+ $showtypes =~ s/,([^,]+)$/ $conjunc $1/;
+ }
$constraints =
- &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+ &mt('Allowed filetypes: [_1]','<b>'.$showtypes.'</b>').'<br />';
}
if ($maxfilesize) {
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
More information about the LON-CAPA-cvs
mailing list