[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework inputtags.pm

[raeburn]

raeburn		Mon Jul  1 23:09:00 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	inputtags.pm 
  Log:
  - For 2.11
    Backport 1.357 
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.333.2.14 loncom/homework/inputtags.pm:1.333.2.15
--- loncom/homework/inputtags.pm:1.333.2.14	Mon Sep 11 13:44:18 2023
+++ loncom/homework/inputtags.pm	Mon Jul  1 23:09:00 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.333.2.14 2023/09/11 13:44:18 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.15 2024/07/01 23:09:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -663,8 +663,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.',