Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	7 Oct 2003 11:24:28 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	10 Oct 2003 14:25:38 -0000	1.3
@@ -98,11 +98,24 @@
         set return_url [subsite::get_element -element url]
     }
 
+    # If the user is self registering, then try to set the preferred
+    # locale (assuming the user has set it as a anonymous visitor
+    # before registering).
+    if { $self_register_p } {
+	# We need to explicitly get the cookie and not use
+	# lang::user::locale, as we are now a registered user,
+	# but one without a valid locale setting.
+	set locale [ad_get_cookie "ad_locale"]
+	if { ![empty_string_p $locale] } {
+	    lang::user::set_locale $locale
+	    ad_set_cookie -replace t -max_age 0 "ad_locale" ""
+	}
+    }
+
     # Handle account_message
     if { ![empty_string_p $creation_info(account_message)] && $self_register_p } {
         # Only do this if user is self-registering
         # as opposed to creating an account for someone else
-
         ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-message" { { message $creation_info(account_message) } return_url }]
         ad_script_abort
     } else {