--- loncom/interface/spreadsheet/Spreadsheet.pm	2003/09/15 20:31:01	1.26
+++ loncom/interface/spreadsheet/Spreadsheet.pm	2003/11/11 14:17:20	1.29
@@ -1,5 +1,5 @@
 #
-# $Id: Spreadsheet.pm,v 1.26 2003/09/15 20:31:01 matthew Exp $
+# $Id: Spreadsheet.pm,v 1.29 2003/11/11 14:17:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,7 @@ use HTML::Entities();
 use HTML::TokeParser;
 use Spreadsheet::WriteExcel;
 use Time::HiRes;
+use Apache::lonlocal;
 
 ##
 ## Package Variables
@@ -749,6 +750,11 @@ sub mask {
     if (($la eq '*') || ($ua eq '*')) {
         $alpha='[A-z]';
     } else {
+        if ($la gt $ua) {
+            my $tmp = $ua;
+            $ua = $la;
+            $la = $ua;
+        }
         $alpha=qq/[$la-$ua]/;
     }
     if ($ld ne '*' && $ud ne '*') {
@@ -1277,7 +1283,7 @@ sub html_header {
     my $self = shift;
     return '' if (! $ENV{'request.role.adv'});
     return "<table>\n".
-        '<tr><th align="center">Output Format</th><tr>'."\n".
+        '<tr><th align="center">'.&mt('Output Format').'</th></tr>'."\n".
         '<tr><td>'.&output_selector()."</td></tr>\n".
         "</table>\n";
 }
@@ -1292,13 +1298,13 @@ sub output_selector {
     }
     foreach (['html','HTML'],
              ['excel','Excel'],
-             ['csv','Comma Seperated Values']) {
+             ['csv','Comma Separated Values']) {
         my ($name,$description) = @{$_};
         $output_selector.=qq{<option value="$name"};
         if ($name eq $default) {
             $output_selector .= ' selected';
         }
-        $output_selector .= ">$description</option>\n";
+        $output_selector .= ">".&mt($description)."</option>\n";
     }
     $output_selector .= "</select>\n";
     return $output_selector;
@@ -1331,9 +1337,9 @@ sub create_excel_spreadsheet {
     my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
     if (! defined($workbook)) {
         $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print("Problems creating new Excel file.  ".
+        $r->print(&mt("Problems creating new Excel file.  ".
                   "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator");
+                  "Please alert your LON-CAPA administrator"));
         return undef;
     }
     #
@@ -1351,7 +1357,7 @@ sub outsheet_excel {
     my $self = shift;
     my ($r) = @_;
     my $connection = $r->connection();
-    $r->print("<h2>Preparing Excel Spreadsheet</h2>");
+    $r->print("<h2>".&mt('Preparing Excel Spreadsheet')."</h2>");
     #
     # Create excel worksheet
     my ($workbook,$filename) = $self->create_excel_spreadsheet($r);
@@ -1403,9 +1409,9 @@ sub outsheet_csv   {
     my $file;
     unless ($file = Apache::File->new('>'.'/home/httpd'.$filename)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print("Problems occured in writing the csv file.  ".
+        $r->print(&mt("Problems occured in writing the csv file.  ".
                   "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
+                  "Please alert your LON-CAPA administrator."));
         $r->print("<pre>\n".$csvdata."</pre>\n");
         return 0;
     }
@@ -1421,7 +1427,7 @@ sub outsheet_csv   {
     # Close the csv file
     close($file);
     $r->print('<br /><br />'.
-              '<a href="'.$filename.'">Your CSV spreadsheet.</a>'."\n");
+              '<a href="'.$filename.'">'.&mt('Your CSV spreadsheet.').'</a>'."\n");
     #
     return 1;
 }
@@ -1747,9 +1753,9 @@ sub othersheets {
                                       $self->{'cdom'}, $self->{'cnum'});
     my ($tmp) = keys(%results);
     if ($tmp =~ /^(con_lost|error|no_such_host)/i ) {
-        @alternatives = ('Default');
+        @alternatives = (&mt('Default'));
     } else {
-        @alternatives = ('Default', sort (keys(%results)));
+        @alternatives = (&mt('Default'), sort (keys(%results)));
     }
     return @alternatives; 
 }