[LON-CAPA-cvs] cvs: loncom(version_2_7_X) /interface lonuserutils.pm

[raeburn]

raeburn		Sat Sep 20 00:02:46 2008 EDT

  Modified files:              (Branch: version_2_7_X)
    /loncom/interface	lonuserutils.pm 
  Log:
  Backport 1.68, 1.69.
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.66 loncom/interface/lonuserutils.pm:1.66.2.1
--- loncom/interface/lonuserutils.pm:1.66	Thu Sep 11 20:55:37 2008
+++ loncom/interface/lonuserutils.pm	Sat Sep 20 00:02:46 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.66 2008/09/12 00:55:37 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.66.2.1 2008/09/20 04:02:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2243,7 +2243,7 @@
                        time.'_'.rand(1000000000).'.csv';
         unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
             $r->log_error("Couldn't open $CSVfilename for output $!");
-            $r->print(&mt('Problems occurred in writing the csv file. '
+            $r->print(&mt('Problems occurred in writing the CSV file. '
                          .'This error has been logged. '
                          .'Please alert your LON-CAPA administrator.'));
             $CSVfile = undef;
@@ -2557,12 +2557,10 @@
             $r->print(&Apache::loncommon::end_data_table().'<br />');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
-        $r->print('<p><a href="'.$excel_filename.'">'.
-                  &mt('Your Excel spreadsheet').'</a> '.&mt('is ready for download').'.</p>'."\n");
+        $r->print(&mt('[_1]Your Excel spreadsheet[_2] is ready for download.', '<p><a href="'.$excel_filename.'">','</a>')."</p>\n");
     } elsif ($mode eq 'csv') {
         close($CSVfile);
-        $r->print('<p><a href="'.$CSVfilename.'">'.
-                  &mt('Your CSV file').'</a> '.&mt('is ready for download').'.</p>'."\n");
+        $r->print(&mt('[_1]Your CSV file[_2] is ready for download.', '<p><a href="'.$CSVfilename.'">','</a>')."</p>\n");
         $r->rflush();
     }
     if ($mode eq 'autoenroll') {