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

[raeburn]

raeburn		Wed Oct 16 20:32:49 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Baclport 1.565, 1.566.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.41 loncom/interface/londocs.pm:1.484.2.42
--- loncom/interface/londocs.pm:1.484.2.41	Sun Sep 22 02:24:27 2013
+++ loncom/interface/londocs.pm	Wed Oct 16 20:32:49 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.41 2013/09/22 02:24:27 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.42 2013/10/16 20:32:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1310,7 +1310,7 @@
                     if ($prefix eq 'smppg') {
                         $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
                     } elsif ($prefix eq 'bulletinboard') {
-                        $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext;
+                        $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -1585,7 +1585,7 @@
                     if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
                     } else {
-                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a bulletin board [_1].',$url);
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
                     }
                     if ($error) {
                         $errtext .= '<br />'.$error;
@@ -1628,7 +1628,7 @@
                         $lockerrorsref->{$prefix} .=
                             ' '.&mt('This will prevent creation of additional simple pages in this course.');
                     } else {
-                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional bulletin boards in this course.');
+                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
                     }
                     $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
                                                      '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
@@ -3496,7 +3496,7 @@
         } elsif ($type eq 'smppg') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
         } else {
-            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.');
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
         }
         if ($error) {
             $errtext .= '<br />'.$error;
@@ -3515,7 +3515,7 @@
                 &mt('This will prevent creation of additional simple pages in this course.');
         } else {
             $locknotfreed .=
-                &mt('This will prevent creation of additional bulletin boards in this course.');
+                &mt('This will prevent creation of additional discussion boards in this course.');
         }
         unless ($type eq 'paste') {
             $locknotfreed .=
@@ -4996,7 +4996,8 @@
                    foreach my $server (keys(%servers)) {
                        next if (grep(/^\Q$server\E$/, at ids));
                        my $hashid=$coursenum.':'.$coursedom;
-                       &Apache::lonnet::remote_devalidate_cache($server,'suppcount',$hashid);
+                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
+                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
                    }
                    &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
                    undef($suppchanges);