--- loncom/interface/lonsearchcat.pm	2003/10/08 20:35:33	1.185.2.1
+++ loncom/interface/lonsearchcat.pm	2003/09/29 16:09:20	1.189
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.185.2.1 2003/10/08 20:35:33 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.189 2003/09/29 16:09:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,6 +82,7 @@ use Text::Query;
 use GDBM_File;
 use Apache::loncommon();
 use Apache::lonmysql();
+use Apache::lonlocal;
 
 # ---------------------------------------- variables used throughout the module
 
@@ -186,7 +187,7 @@ sub handler {
                       # This button is different for the RAT compared to
                       # normal invocation.
     #
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
     ##
@@ -440,7 +441,7 @@ sub course_search {
    }
    &untiehash();
     unless ($totalfound) {
-	$r->print('<p>No resources found.</p>');
+	$r->print('<p>'.&mt('No resources found').'.</p>');
     }
 # =================================================== Done going through course
     $r->print('</body></html>');
@@ -558,41 +559,47 @@ ENDDOCUMENT
     my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
     my $domain = $r->dir_config('lonDefDomain');
     my $domaincheckbox = &simplecheckbox('domains',$domain);
+    my $srch=&mt('Search');
+    my $header=&mt('Advanced Search');
     $scrout.=<<END;
 </td><td><a
-href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
->Advanced Search</a></td></tr>
+href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}"
+>$header</a></td></tr>
 <tr><td>$relatedcheckbox use related words</td>
     <td>$domaincheckbox only search domain <b>$domain</b></td></tr>
 </table>
 </p>
 <p>
-&nbsp;<input type="submit" name="basicsubmit" value='SEARCH' />&nbsp;
+&nbsp;<input type="submit" name="basicsubmit" value='$srch' />&nbsp;
 $closebutton
 END
-    $scrout.=&selectbox(undef,'viewselect',
+    $scrout.=&selectbox('View','viewselect',
 			$ENV{'form.viewselect'},
 			undef,undef,undef,
 			sort(keys(%Views)));
-    $scrout.=&selectbox(undef,'show',
+    $scrout.=&selectbox('Per Page','show',
 			$ENV{'form.show'},
 			undef,undef,undef,
 			(10,20,50,100));
     $scrout.=<<ENDDOCUMENT;
-per page.
 </p>
 </form>
 ENDDOCUMENT
     }
     if ($ENV{'request.course.id'}) {
+	my %lt=&Apache::lonlocal::texthash(
+					   'srch' => 'Search',
+                                           'header' => 'Course Search',
+	 'note' => 'Enter terms or phrases, then press "Search" below',
+					   );
         $scrout.=(<<ENDCOURSESEARCH);
 <hr />
-<h1>Course Search</h1>    
+<h1>$lt{'header'}</h1>    
 <form method="post" action="/adm/searchcat">
 <input type="hidden" name="phase" value="course_search" />
 $hidden_fields
 <p>
-Enter terms or phrases, then press SEARCH below.
+$lt{'note'}.
 </p>
 <p>
 <table>
@@ -609,7 +616,7 @@ ENDCOURSESEARCH
 <tr><td>$relcheckbox use related words</td><td></td></tr>
 <tr><td>$crscheckbox fulltext search (time consuming)</td><td></td></tr>
 </table><p>
-&nbsp;<input type="submit" name="coursesubmit" value='SEARCH' />
+&nbsp;<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
 </p>
 ENDENDCOURSE
     }
@@ -681,8 +688,8 @@ ENDHEADER
 			undef,undef,undef,
 			(10,20,50,100));
     $scrout.='&nbsp;'.
-        '<font color="#800000" face="helvetica">Per Page</font>';
-    $scrout.="</td><td>Related<br />Words</td></tr>\n";
+        '<font color="#800000" face="helvetica">'.&mt('Per Page').'</font>';
+    $scrout.="</td><td>".&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
     $scrout.=&searchphrasefield_with_related('title',   'title'   ,
                                              $ENV{'form.title'});
     $scrout.=&searchphrasefield('author',  'author'  ,$ENV{'form.author'});
@@ -1057,7 +1064,7 @@ field heading.
 ###############################################
 
 sub fieldtitle {
-    my $title = uc(shift());
+    my $title = uc(&mt(shift()));
     return '<font color="#800000" face="helvetica"><b>'.$title.
         ':&nbsp;</b></font>';
 }
@@ -1152,7 +1159,7 @@ END
     my $i = 1;
     foreach (qw/January February March April May June 
 	     July August September October November December /){
-	$month .="<option value=\"$i\">$_</option>\n";
+	$month .="<option value=\"$i\">".&mt($_)."</option>\n";
 	$i++;
     }
     $month.="</select>\n";
@@ -1229,6 +1236,7 @@ sub selectbox {
     my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
     if (! defined($functionref)) { $functionref = sub { $_[0]}; }
     my $selout='';
+    $title=&mt($title);
     if (defined($title)) {
         my $uctitle=uc($title);
         $selout="\n".'<p><font color="#800000" face="helvetica">'.
@@ -1239,12 +1247,12 @@ sub selectbox {
     foreach (@idlist) {
         $selout.='<option value="'.$_.'"';
         if ($_ eq $default and !/^any$/) {
-	    $selout.=' selected >'.&{$functionref}($_).'</option>';
+	    $selout.=' selected >'.&mt(&{$functionref}($_)).'</option>';
 	}
 	elsif ($_ eq $default and /^$anyvalue$/) {
-	    $selout.=' selected >'.$anytag.'</option>';
+	    $selout.=' selected >'.&mt($anytag).'</option>';
 	}
-        else {$selout.='>'.&{$functionref}($_).'</option>';}
+        else {$selout.='>'.&mt(&{$functionref}($_)).'</option>';}
     }
     return $selout.'</select>'.(defined($title)?'</p>':' ');
 }
@@ -1839,8 +1847,8 @@ sub ensure_db_and_table {
 sub print_sort_form {
     my ($r,$pretty_query_string) = @_;
     ##
-    my %SortableFields = 
-        (id        => 'Default',
+    my %SortableFields=&Apache::lonlocal::texthash( 
+         id        => 'Default',
          title     => 'Title',
          author    => 'Author',
          subject   => 'Subject',
@@ -1852,7 +1860,7 @@ sub print_sort_form {
          copyright => 'Copyright',
          hostname  => 'Host',
          creationdate     => 'Creation Date',
-         lastrevisiondate => 'Revision Date',
+         lastrevisiondate => 'Revision Date'
      );
     ##
     my $table = $ENV{'form.table'};
@@ -2106,7 +2114,7 @@ END
     if (@Lines > 2) {
         $pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
     }
-    $r->print("Search: ".$pretty_string);
+    $r->print(&mt("Search").": ".$pretty_string);
     $r->rflush();
     #
     # Determine the servers we need to contact.
@@ -2172,7 +2180,7 @@ END
         if (@Servers_to_contact) {
             # Contact one server
             my $server = shift(@Servers_to_contact);
-            &update_status($r,'contacting '.$server);
+            &update_status($r,&mt('contacting').' '.$server);
             my $reply=&Apache::lonnet::metadata_query($query,$customquery,
                                                       $customshow,[$server]);
             ($server) = keys(%$reply);
@@ -2184,7 +2192,7 @@ END
             # left to contact.  
             if (scalar (keys(%Server_status))) {
                 &update_status($r,
-                               'waiting on '.(join(' ',keys(%Server_status))));
+                       &mt('waiting on').' '.(join(' ',keys(%Server_status))));
             }
             sleep(1); 
         }
@@ -2201,12 +2209,12 @@ END
             $status=~/^([\.\w]+)$/; 
        	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
             if (-e $datafile && ! -e "$datafile.end") {
-                &update_status($r,'Receiving results from '.$server);
+                &update_status($r,&mt('Receiving results from').' '.$server);
                 next;
             }
             last if ($connection->aborted());
             if (-e "$datafile.end") {
-                &update_status($r,'Reading results from '.$server);
+                &update_status($r,&mt('Reading results from').' '.$server);
                 if (-z "$datafile") {
                     delete($Server_status{$server});
                     next;
@@ -2261,7 +2269,7 @@ END
             &update_seconds($r,$time_remaining);
         }
     }
-    &update_status($r,'Search Complete'.$server);
+    &update_status($r,&mt('Search Complete').$server);
     &update_seconds($r,0);
     &Apache::lonmysql::disconnect_from_db();
     # We have run out of time or run out of servers to talk to and
@@ -2406,7 +2414,7 @@ sub display_results {
          );
     if ($total_results == 0) {
         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
-                  '<h3>There are currently no results.</h3>'.
+                  '<h3>'.&mt('There are currently no results').'.</h3>'.
                   "</form></body></html>");
         return;
     } else {
@@ -2437,7 +2445,7 @@ sub display_results {
         $r->rflush();
     }
     if (@Results < 1) {
-        $r->print("There were no results matching your query");
+        $r->print(&mt("There were no results matching your query"));
     } else {
         $r->print
             ('<center>'.