Index: openacs-4/packages/acs-lang/www/change-locale-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale-include.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	28 Oct 2002 12:32:49 -0000	1.2
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	15 Nov 2002 09:22:43 -0000	1.3
@@ -3,7 +3,7 @@
 # a user
 # @author Peter Marklund (peter@collaboraid.biz)
 
-if { ![exists_and_not_null return_url] } {
+if { ![exists_and_not_null return_url] && [exists_and_not_null return_p] && [string equal $return_p "t"] } {
     # Use referer header
     set return_url [ns_set iget [ns_conn headers] referer]
 }
Index: openacs-4/packages/acs-lang/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/index.adp	5 Nov 2002 14:52:06 -0000	1.2
+++ openacs-4/packages/acs-lang/www/index.adp	15 Nov 2002 09:22:43 -0000	1.3
@@ -3,13 +3,15 @@
   <property name="context_bar">@context_bar@</property>
 
 <if @admin_p@>
-<table width="100%">
-<tr><td align="right">
-<a href="admin">Message Catalog Administration</a>
-</td></tr>
-</table>
+  <table align="right">
+    <tr>
+      <td align="right">
+        <a href="admin">Administration</a>
+      </td>
+    </tr>
+  </table>
 </if>
 
 <blockquote>
-<include src="/packages/acs-lang/www/change-locale-include">
+<include src="/packages/acs-lang/www/change-locale-include" return_url="@return_url@" return_p="@return_p@">
 </blockquote>
Index: openacs-4/packages/acs-lang/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/index.tcl	5 Nov 2002 14:52:06 -0000	1.2
+++ openacs-4/packages/acs-lang/www/index.tcl	15 Nov 2002 09:22:43 -0000	1.3
@@ -1,5 +1,8 @@
 ad_page_contract {
     Localization home
+} {
+    {return_url ""}
+    {return_p "f"}
 }
 
 set instance_name [ad_conn instance_name]
@@ -11,4 +14,4 @@
 
 set locale [ad_locale user locale]
 set language [ad_locale user language]
-set admin_p [ad_permission_p [ad_conn package_id] admin]
\ No newline at end of file
+set admin_p [ad_permission_p [ad_conn package_id] admin]