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.4 -r1.5
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	8 Oct 2002 08:48:48 -0000	1.4
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	28 Oct 2002 12:32:45 -0000	1.5
@@ -124,7 +124,8 @@
     } {
         set user_id [ad_conn user_id]
         if { $user_id == 0 } {
-            return ""
+            # Not logged in, use a session-based client property
+            return [ad_get_client_property -cache t "acs-lang" "user_locale"]
         }
     
         # Pssst! We don't actually use this package thing, 
@@ -160,6 +161,8 @@
     } {
         set user_id [ad_conn user_id]
         if { $user_id == 0 } {
+            # Not logged in, use a session-based client property
+            ad_set_client_property -persistent t "acs-lang" "user_locale" $locale
             return
         }
     
@@ -173,9 +176,15 @@
 
         set user_locale_exists_p [db_string user_locale_exists_p {}]
         if { $user_locale_exists_p } {
-            db_dml update_user_locale {}
+            if { ![empty_string_p $locale] } {
+                db_dml update_user_locale {}
+            } else {
+                db_dml delete_user_locale {}
+            }
         } else {
-            db_dml insert_user_locale {}
+            if { ![empty_string_p $locale] } {
+                db_dml insert_user_locale {}
+            }
         }
     }