[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm

[raeburn]

raeburn		Thu Mar 11 21:18:24 2010 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Wording change: scantron -> bubblesheet replacements.
  - Eliminate duplicate declaration for $itemcount.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.129 loncom/interface/domainprefs.pm:1.130
--- loncom/interface/domainprefs.pm:1.129	Mon Mar  8 14:36:24 2010
+++ loncom/interface/domainprefs.pm	Thu Mar 11 21:18:24 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.129 2010/03/08 14:36:24 raeburn Exp $
+# $Id: domainprefs.pm,v 1.130 2010/03/11 21:18:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -658,7 +658,6 @@
     my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
     my ($css_class,$datatable);
     my %choices = &login_choices();
-    my $itemcount = 1;
 
     if ($position eq 'top') {
         my %servers = &dom_servers($dom);
@@ -2762,7 +2761,7 @@
                       '<span class="LC_nobreak">';
         if ($scantronurl) {
             $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Default scantron format file').'</a>';
+                          &mt('Default bubblesheet format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
@@ -2789,7 +2788,7 @@
         } elsif ($scantronurl) {
             $datatable .= '<td><span class="LC_nobreak">'.
                           '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Custom scantron format file').'</a><label>'.
+                          &mt('Custom bubblesheet format file').'</a><label>'.
                           '<input type="checkbox" name="scantronformat_del"'.
                           '" value="1" />'.&mt('Delete?').'</label></span></td>'.
                           '<td><span class="LC_nobreak">&nbsp;'.
@@ -2818,7 +2817,7 @@
             &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
                          '','',$newfile);
         if ($result ne 'ok') {
-            $error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result);
+            $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
         }
     }
     return ($url,$error);
@@ -5817,7 +5816,7 @@
         my $error;
         if ($configuserok eq 'ok') {
             if ($switchserver) {
-                $error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver);
+                $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver);
             } else {
                 if ($author_ok eq 'ok') {
                     my ($result,$scantronurl) =
@@ -5857,25 +5856,25 @@
                 if (ref($confhash{'scantron'}) eq 'HASH') {
                     $resulttext = &mt('Changes made:').'<ul>';
                     if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                        $resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                        $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
+                        $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
                     }
                     $resulttext .= '</ul>';
                 } else {
-                    $resulttext = &mt('Changes made to scantron format file.');
+                    $resulttext = &mt('Changes made to bubblesheet format file.');
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
             } else {
-                $resulttext = &mt('No changes made to scantron format file');
+                $resulttext = &mt('No changes made to bubblesheet format file');
             }
         } else {
             $resulttext = '<span class="LC_error">'.
                 &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to scantron format file'); 
+        $resulttext = &mt('No changes made to bubblesheet format file'); 
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.