Index: openacs-4/packages/acs-lang/lib/change-locale-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/change-locale-bar.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/lib/change-locale-bar.tcl	10 May 2004 17:58:56 -0000	1.1
+++ openacs-4/packages/acs-lang/lib/change-locale-bar.tcl	11 May 2004 07:58:25 -0000	1.2
@@ -53,7 +53,7 @@
 # system default for "Change Locale".  The reason is that, after a list of language names, "..." should
 # be more recognizable than a foreign word
 
-if {$enabled_locale_count > $switchable_count && $enabled_locale_count > 1} {
+if {$enabled_locale_count > $switchable_count && $switchable_count > 1} {
     set change_locale_url [export_vars -base $base_lang_url {return_url}]
     set browser_locale [lang::conn::browser_locale]
     set exists_p [lang::message::message_exists_p $browser_locale acs-lang.change-locale]
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 -N -r1.12 -r1.13
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	9 May 2004 14:57:58 -0000	1.12
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	11 May 2004 07:58:26 -0000	1.13
@@ -1,18 +1,18 @@
-ad_page_contract {
-    Change user preffered locale
+# includelet pseudo-contract
+#    Change user preferred locale
 
-    @author Peter Marklund (peter@collaboraid.biz)
-    @author Christian Hvid
-} {
-    { return_url "" }
-    { package_id "" }
-}
+#    @author Peter Marklund (peter@collaboraid.biz)
+#    @author Christian Hvid
 
-if { $return_url == "" } {
+if { ![exists_and_not_null return_url] } {
     # Use referer header
     set return_url [ns_set iget [ns_conn headers] referer]
 }
 
+if { ![exists_and_not_null package_id] } {
+    set package_id [ad_conn package_id]
+}
+
 set use_timezone_p [expr [lang::system::timezone_support_p] && [ad_conn user_id]]
 
 #