Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	10 Oct 2003 13:02:33 -0000	1.19
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	10 Oct 2003 13:59:22 -0000	1.20
@@ -242,7 +242,11 @@
     Get the user's preferred site wide locale.
 } {
     if { [ad_conn untrusted_user_id] == 0 } {
-	return [ad_get_cookie "ad_locale"]
+	set locale [ad_get_cookie "ad_locale"]
+	if { [empty_string_p $locale] } {
+	    set locale [lang::system::site_wide_locale]
+	}
+	return $locale
     } else {
         set user_id [ad_conn untrusted_user_id]
         return [db_string get_user_site_wide_locale {} -default ""]
@@ -288,7 +292,7 @@
 
     if { $user_id == 0 } {
         # Not logged in, use a cookie-based client locale
-	ad_set_cookie -expire never "ad_locale" $locale
+	ad_set_cookie -replace t -max_age inf "ad_locale" $locale
         return
     }