Index: openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	9 May 2004 15:32:38 -0000	1.1
+++ openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	30 Dec 2004 12:01:48 -0000	1.1.2.1
@@ -1,4 +1,40 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="search" package_version="5.1.0" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="search" package_version="5.1.3" locale="en_US" charset="ISO-8859-1">
+
+  <msg key="________Search_took">.
+        Search took</msg>
   <msg key="Advanced_Search">Advanced Search</msg>
+  <msg key="advanced_search">&quot;advanced search&quot;</msg>
+  <msg key="anytime">anytime</msg>
+  <msg key="Date_Range">Date Range</msg>
+  <msg key="details">details</msg>
+  <msg key="Feeling_Lucky">Feeling Lucky</msg>
+  <msg key="lt_bstopwordsb_is_a_very">&quot;&lt;b&gt;%stopwords%&lt;/b&gt;&quot; is a very common word and was not included in your search.</msg>
+  <msg key="lt_FtsEngineDriver_not_a">FtsEngineDriver not available!</msg>
+  <msg key="lt_Make_sure_all_words_a">Make sure all words are spelled correctly.</msg>
+  <msg key="lt_No_pages_were_found_c">No pages were found containing &quot;</msg>
+  <msg key="lt_The_following_words_a">The following words are very common and were not included in your search:</msg>
+  <msg key="lt_Tip_In_most_browsers_">Tip: In most browsers you can just hit the return key instead of clicking on the search button.</msg>
+  <msg key="lt_Try_different_keyword">Try different keywords.</msg>
+  <msg key="lt_Try_more_general_keyw">Try more general keywords.</msg>
+  <msg key="lt_Try_your_query_on_stw">Try your query on: %stw;noquote%</msg>
+  <msg key="lt_You_must_specify_some">You must specify some keywords</msg>
+  <msg key="nbspDisplay">&amp;nbsp;Display</msg>
+  <msg key="Next">Next</msg>
+  <msg key="of_about">of about</msg>
+  <msg key="past_3_months">past 3 months</msg>
+  <msg key="past_6_months">past 6 months</msg>
+  <msg key="past_year">past year</msg>
+  <msg key="Previous">Previous</msg>
+  <msg key="Result_page">Result page:</msg>
+  <msg key="Results">Results</msg>
+  <msg key="results">results</msg>
+  <msg key="Search">Search</msg>
+  <msg key="Searched_for_query">Searched for: %query%</msg>
+  <msg key="seconds">seconds.</msg>
+  <msg key="selected">selected</msg>
+  <msg key="Suggestions">Suggestions:</msg>
+  <msg key="The">&quot;&lt;b&gt;AND&lt;/b&gt;&quot; operator is unnecessary -- we include all search terms by default.</msg>
+  <msg key="Try_fewer_keywords">Try fewer keywords.</msg>
+  <msg key="Untitled">Untitled</msg>
 </message_catalog>
Index: openacs-4/packages/search/www/advanced-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.adp,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/search/www/advanced-search.adp	20 Sep 2002 21:11:47 -0000	1.2
+++ openacs-4/packages/search/www/advanced-search.adp	30 Dec 2004 12:01:48 -0000	1.2.4.1
@@ -1,25 +1,25 @@
 <master>
-<property name="title">Advanced Search</property>
+<property name="title">#search.Advanced_Search#</property>
 <property name="context">"advanced search"</property>
 
-
 <form method=GET action=search>
 <input type=text name=q size=41 maxlength=256 value="@q@">
 <input type=submit value="Search" name=t>
 <br>
-Date Range
+#search.Date_Range#
 <select name=dfs>
-  <option value=all> anytime
-  <option value=m3> past 3 months
-  <option value=m6> past 6 months
-  <option value=y1> past year
+  <option value=all> #search.anytime#
+  <option value=m3> #search.past_3_months#
+  <option value=m6> #search.past_6_months#
+  <option value=y1> #search.past_year#
 </select>
-&nbsp;Display
+#search.nbspDisplay#
 <select name=num>
- <option value=10 <if @num@ eq 10>selected</if>>10 results
- <option value=20 <if @num@ eq 20>selected</if>>20 results
- <option value=30 <if @num@ eq 30>selected</if>>30 results
- <option value=50 <if @num@ eq 50>selected</if>>50 results
- <option value=100 <if @num@ eq 100>selected</if>>100 results
+ <option value=10 <if @num@ eq 10>#search.selected#</if>>10 #search.results#
+ <option value=20 <if @num@ eq 20>#search.selected#</if>>20 #search.results#
+ <option value=30 <if @num@ eq 30>#search.selected#</if>>30 #search.results#
+ <option value=50 <if @num@ eq 50>#search.selected#</if>>50 #search.results#
+ <option value=100 <if @num@ eq 100>#search.selected#</if>>100 #search.results#
 </select>
 </form>
+
Index: openacs-4/packages/search/www/advanced-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.tcl,v
diff -u -r1.1 -r1.1.6.1
--- openacs-4/packages/search/www/advanced-search.tcl	15 Sep 2001 21:31:50 -0000	1.1
+++ openacs-4/packages/search/www/advanced-search.tcl	30 Dec 2004 12:01:48 -0000	1.1.6.1
@@ -12,6 +12,7 @@
 }
 
 set title "Advanced Search"
+set context "advanced search"
 set context_bar [ad_context_bar $title]
 
 
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/search/www/index.adp	20 Sep 2002 21:11:47 -0000	1.3
+++ openacs-4/packages/search/www/index.adp	30 Dec 2004 12:01:48 -0000	1.3.4.1
@@ -1,16 +1,16 @@
 <master>
-<property name="title">Search</property>
-<property name="context">Search</property>
+<property name="title">#search.Search#</property>
+<property name="context">#search.Search#</property>
 
 <center>
 <form method=GET action=search>
   <small>
-  <a href=advanced-search>Advanced Search</a>
+  <a href=advanced-search>#search.Advanced_Search#</a>
   <br>
   <input type=text name=q size=80 maxlength=256>
   <br>
-  <input type=submit value="Search" name=t>
-  <input type=submit value="Feeling Lucky" name=t>
+  <input type=submit value="#search.Search#" name=t>
+  <input type=submit value="#search.Feeling_Lucky#" name=t>
   </small>
 </form>
-</center>
\ No newline at end of file
+</center>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/search/www/search.adp	26 Feb 2004 15:29:22 -0000	1.2
+++ openacs-4/packages/search/www/search.adp	30 Dec 2004 12:01:48 -0000	1.2.2.1
@@ -3,39 +3,39 @@
 <property name="context">@context;noquote@</property>
 <form method=GET action=search>
   <small>
-    <a href=@url_advanced_search@>Advanced Search</a>
+    <a href=@url_advanced_search@>#search.Advanced_Search#</a>
     <br>
     <input type=text name=q size=31 maxlength=256 value="@query@">
-    <input type=submit value="Search" name=t>
-    <input type=submit value="Feeling Lucky" name=t>
+    <input type=submit value="#search.Search#" name=t>
+    <input type=submit value="#search.Feeling_Lucky#" name=t>
   </small>
 </form>
 <if @t@ eq "Search">
-  <i>Tip: In most browsers you can just hit the return key instead of clicking on the search button.</i><br><br>
+  <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
 </if>
 
 	<if @and_queries_notice_p@ eq 1>
       	  <font color=6f6f6f>
-          The "<b>AND</b>" operator is unnecessary -- we include all search terms by default. 
-          [<a href=help/basics#and>details</a>]<br>
+          #search.The#
+          [<a href=help/basics#and>#search.details#</a>]<br>
         </font>
 	</if>
 	<if @nstopwords@ eq 1>
         <font color=6f6f6f>
-          "<b>@stopwords@</b>" is a very common word and was not included in your search.
-          [<a href=help/basics#stopwords>details</a>]<br>
+          #search.lt_bstopwordsb_is_a_very#
+          [<a href=help/basics#stopwords>#search.details#</a>]<br>
         </font>
 	</if>
 	<if @nstopwords@ gt 1>
       	  <font color=6f6f6f>
-          The following words are very common and were not included in your search: <b>@stopwords@</b>.
-          [<a href=help/basics#stopwords>details</a>]<br>
+          #search.lt_The_following_words_a# <b>@stopwords@</b>.
+          [<a href=help/basics#stopwords>#search.details#</a>]<br>
       	  </font>
 	</if>
 
 <multiple name="searchresult">
 	<if @searchresult.title_summary@ nil>
-  		<a href=@searchresult.url_one@>Untitled</a><br>
+  		<a href=@searchresult.url_one@>#search.Untitled#</a><br>
 	</if>	
 	<else>
 	  <a href=@searchresult.url_one@>@searchresult.title_summary;noquote@</a><br>
@@ -50,27 +50,26 @@
 
 <if @count@ eq 0>
   Your search - <b>@query@</b> - did not match any documents.
-  <br>No pages were found containing "<b>@query@</b>".
-  <br><br>Suggestions:
+  <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
+  <br><br>#search.Suggestions#
   <ul>
-    <li>Make sure all words are spelled correctly.
-    <li>Try different keywords.
-    <li>Try more general keywords.
+    <li>#search.lt_Make_sure_all_words_a#
+    <li>#search.lt_Try_different_keyword#
+    <li>#search.lt_Try_more_general_keyw#
     <if @nquery@ gt 2>
-      <li>Try fewer keywords.
+      <li>#search.Try_fewer_keywords#
     </if>
   </ul>
 </if>
 <else>
   <table width=100% bgcolor=3366cc border=0 cellpadding=3 cellspacing=0>
     <tr><td>
       <font color=white>
-        Searched for: @query@
+        #search.Searched_for_query#
       </font>
     </td><td align=right>
       <font color=white>
-        Results <b>@low@-@high@</b> of about <b>@count@</b>.
-        Search took <b>@elapsed@</b> seconds. 
+        #search.Results# <b>@low@-@high@</b> #search.of_about# <b>@count@</b>#search.________Search_took# <b>@elapsed@</b> #search.seconds# 
       </font>     
     </td></tr>
   </table>
@@ -80,15 +79,15 @@
 <if @from_result_page@ lt @to_result_page@>
   <center>
 
-    <small>Result page:</small>
+    <small>#search.Result_page#</small>
 
     <if @from_result_page@ lt @current_result_page@>
-      <small><a href=@url_previous@><font color=0000cc><b>Previous</b></font></a></small>
+      <small><a href=@url_previous@><font color=0000cc><b>#search.Previous#</b></font></a></small>
     </if>
     &nbsp;@choice_bar;noquote@&nbsp;
     
     <if @current_result_page@ lt @to_result_page@>
-	<small><a href=@url_next@><font color=0000cc><b>Next</b></font></a></small>
+	<small><a href=@url_next@><font color=0000cc><b>#search.Next#</b></font></a></small>
     </if>
   </center>
 </if>
@@ -110,7 +109,7 @@
 
   <if @stw@ not nil>
     <center>
-      <font size=-1>Try your query on: @stw;noquote@</font></center>
+      <font size=-1>#search.lt_Try_your_query_on_stw#</font></center>
     </center>
   </if>
-</if>
\ No newline at end of file
+</if>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/search/www/search.tcl	30 Dec 2004 11:14:25 -0000	1.10.2.1
+++ openacs-4/packages/search/www/search.tcl	30 Dec 2004 12:01:48 -0000	1.10.2.2
@@ -10,7 +10,7 @@
     {dfs:trim ""}
     {dts:trim ""}
 } -errors {
-    q:notnull {You must specify some keywords.}
+    q:notnull {[_ search.lt_You_must_specify_some].}
 }
 
 
@@ -30,7 +30,7 @@
 
 if { [array get info] == "" } {
     ReturnHeaders
-    ns_write "FtsEngineDriver not available!"
+    ns_write "[_ search.lt_FtsEngineDriver_not_a]"
     return
 } 
 if { $num <= 0} {
@@ -95,6 +95,13 @@
     set title_summary [acs_sc_call FtsEngineDriver summary [list $q $datasource(title)] $driver]
     set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
     set url_one [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+    
+    # Replace the "index" with ETP as this is not needed for accessing the page
+    if {[string equal $object_type "etp_page_revision"]} {
+	set url_one [string trimright $url_one "index"]
+    }
+
+    # Make sure that only items are displayed the user has access to.
     if {[permission::permission_p -object_id $object_id -privilege read]} {
 	template::multirow append searchresult $title_summary $txt_summary $url_one
     }