[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Sun Sep 22 01:58:14 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1155, 1.1156.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.52 loncom/interface/loncommon.pm:1.1075.2.53
--- loncom/interface/loncommon.pm:1.1075.2.52	Sat Sep  7 21:10:00 2013
+++ loncom/interface/loncommon.pm	Sun Sep 22 01:58:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.52 2013/09/07 21:10:00 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.53 2013/09/22 01:58:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9774,11 +9774,10 @@
     my $numexisting = 0;
     my $numunused = 0;
     my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum,
-        $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path);
+        $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path,$navmap);
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
-    my ($navmap,$cdom,$cnum);
     if ($env{'request.course.id'}) {
         if ($actionurl eq '/adm/dependencies') {
             $navmap = Apache::lonnavmaps::navmap->new();
@@ -10430,7 +10429,8 @@
         # Check if extension is valid
         if (($fname =~ /\.(\w+)$/) &&
             (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
-            $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';
+            $output .= &mt('Invalid file extension ([_1]) - reserved for internal use.',$1)
+                      .' '.&mt('Rename the file with a different extension and re-upload.').'<br />';
             next;
         } elsif (($fname =~ /\.(\w+)$/) &&
                  (!defined(&Apache::loncommon::fileembstyle($1)))) {