Index: openacs-4/packages/acs-subsite/www/register/user-join.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/www/register/user-join.tcl	22 Jun 2015 21:03:13 -0000	1.14
+++ openacs-4/packages/acs-subsite/www/register/user-join.tcl	7 Aug 2017 23:47:59 -0000	1.15
@@ -11,7 +11,7 @@
 } {
     {group_id:naturalnum,notnull {[application_group::group_id_from_package_id]}}
     {rel_type:notnull "membership_rel"}
-    {return_url {}}
+    {return_url:localurl {}}
 } -properties {
     context:onevalue
     role_pretty_name:onevalue
@@ -170,19 +170,24 @@
             -member_state $member_state
 
     } on_error {
-        global errorInfo
-        ns_log Error "user-join: Error when adding user to group: $errmsg\n$errorInfo"
-        
-        ad_return_error "Error Joining" "We experienced an error adding you to the group."
+        ns_log Error "user-join: Error when adding user to group: $errmsg\n$::errorInfo"
+
+        ad_return_error [_ acs-subsite.Error_joining] [_ acs-subsite.Error_joining_details]
         ad_script_abort
     }
     
     switch $member_state {
-        "approved" { set message "You have joined the group \"$group_name\"." }
-        "needs approval" { set message "Your request to join group \"$group_name\" has been submitted." }
+        "approved" { set message "[_ acs-subsite.You_joined_group]." }
+        "needs approval" { set message "[_ acs-subsite.Request_join_submitted]." }
     }
 
 
     ad_returnredirect -message $message $return_url
     ad_script_abort
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: