Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.72 -r1.73
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	1 Mar 2005 00:01:21 -0000	1.72
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	13 Mar 2005 23:51:14 -0000	1.73
@@ -180,16 +180,16 @@
         if { [empty_string_p $email] } {
             set result(auth_status) "auth_error"
             if { [auth::UseEmailForLoginP] } {
-                set result(auth_message) "Email required"
+                set result(auth_message) [_ acs-subsite.Email_required]
             } else {
-                set result(auth_message) "Username required"
+                set result(auth_message) [_ acs-subsite.Username_required]
             }
             return [array get result]
         }
         set user_id [cc_lookup_email_user $email]
         if { [empty_string_p $user_id] } {
             set result(auth_status) "no_account"
-            set result(auth_message) "Unknown email"
+            set result(auth_message) [_ acs-subsite.Unknown_email]
             return [array get result]
         }
         acs_user::get -user_id $user_id -array user
@@ -250,7 +250,7 @@
             ns_log Error "auth::authenticate: Illegal auth_status code '$result(auth_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])"
 
             set result(auth_status) "failed_to_connect"
-            set result(auth_message) "Internal error during authentication"
+            set result(auth_message) [_ acs-subsite.Auth_internal_error]
             return [array get result]
         }
     }
@@ -265,14 +265,14 @@
         }
         closed {
             if { ![exists_and_not_null result(account_message)] } {
-                set result(account_message) "This account is not available at this time"
+                set result(account_message) [_ acs-subsite.Account_not_avail_now]
             }
         }
         default {
             ns_log Error "auth::authenticate: Illegal account_status code '$result(account_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])"
 
             set result(account_status) "closed"
-            set result(account_message) "Internal error during authentication"
+            set result(account_message) [_ acs-subsite.Auth_internal_error]
         }
     }
 
@@ -307,14 +307,14 @@
         }
         closed {
             if { ![exists_and_not_null result(account_message)] } {
-                set result(account_message) "This account is not available at this time"
+                set result(account_message) [_ acs-subsite.Account_not_avail_now]
             }
         }
         default {
             ns_log Error "auth::authenticate: Illegal account_status code '$result(account_status)' returned from auth::get_local_account for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])"
 
             set result(account_status) "closed"
-            set result(account_message) "Internal error during authentication"
+            set result(account_message) [_ acs-subsite.Auth_internal_error]
         }
     }
     
@@ -444,9 +444,9 @@
         if { ![string equal $password $password_confirm] } {
             return [list \
                         creation_status data_error \
-                        creation_message "Passwords don't match" \
+                        creation_message [_ acs-subsite.Passwords_dont_match] \
                         element_messages [list \
-                                              password_confirm "Passwords don't match"]]
+                                              password_confirm [_ acs-subsite.Passwords_dont_match] ]]
         }
     }
 
@@ -561,7 +561,7 @@
                 }
                 closed {
                     if { ![exists_and_not_null creation_info(account_message)] } {
-                        set creation_info(account_message) "This account is not available at this time"
+                        set creation_info(account_message) [_ acs-subsite.Account_not_avail_now]
                     }
                 }
                 default {
@@ -936,7 +936,7 @@
 
     if { $error_p || $user_id == 0 } {
         set result(creation_status) "failed_to_connect"
-        set result(creation_message) "We experienced an error while trying to register an account for you."
+        set result(creation_message) [_ acs-subsite.Error_trying_to_register]
         global errorInfo
         ns_log Error "auth::create_local_account: Error creating local account.\n$errorInfo"
         return [array get result]
@@ -962,7 +962,7 @@
         } {
             global errorInfo
             ns_log Error "auth::create_local_account: Error sending out email verification email to email $email:\n$errorInfo"
-            set auth_info(account_message) "We got an error sending out the email for email verification"
+            set auth_info(account_message) [_ acs_subsite.Error_sending_verification_mail]
         }
     }
 
@@ -1091,7 +1091,7 @@
 
     if { $error_p } {
         set result(update_status) "failed_to_connect"
-        set result(update_message) "We experienced an error while trying to update the account information."
+        set result(update_message) [_ acs-subsite.Error_update_account_info]
         global errorInfo
         ns_log Error "Error updating local account.\n$errorInfo"
         return [array get result]
@@ -1132,7 +1132,7 @@
     
     if { [empty_string_p $user_id] } {
         set result(delete_status) "delete_error"
-        set result(delete_message) "No user found with this username"
+        set result(delete_message) [_ acs-subsite.No_user_with_this_username]
         return [array get result]
     }
     
@@ -1227,10 +1227,10 @@
             # Used to get help contact info
             auth::authority::get -authority_id $authority_id -array authority
             set system_name [ad_system_name]
-            set auth_info(account_message) "You have successfully authenticated, but you do not have an account on $system_name yet."
+            set auth_info(account_message) [_ acs-subsite.Success_but_no_account_yet]
             
             if { ![empty_string_p $authority(help_contact_text)] } {
-                append auth_info(account_message) "<p><h3>Help Information</h3>"
+                append auth_info(account_message) [_ acs-subsite.Help_information]
                 append auth_info(account_message) [ad_html_text_convert \
                                                        -from $authority(help_contact_text_format) \
                                                        -to "text/html" -- $authority(help_contact_text)]
@@ -1294,7 +1294,7 @@
                     } {
                         global errorInfo
                         ns_log Error "auth::check_local_account_status: Error sending out email verification email to email $email:\n$errorInfo"
-                        set result(account_message) "We got an error sending out the email for email verification"
+                        set result(account_message) [_ acs-subsite.Error_sending_verification_mail]
                     }
                 }
             } elseif { [string equal [acs_user::ScreenName] "require"] && [empty_string_p $screen_name] } {
@@ -1303,7 +1303,7 @@
             } elseif { $PasswordExpirationDays > 0 && \
                            ([empty_string_p $password_age_days] || $password_age_days > $PasswordExpirationDays) } {
                 
-                set message "Your password must be changed regularly. Please change your password now."
+                set message [_ acs-subsite.Password_regular_change_now]
                 set result(account_url) [export_vars -base "[subsite::get_element -element url]user/password-update" { return_url message }]
             } else {
                 set result(account_status) "ok"
@@ -1321,8 +1321,7 @@
                 "<p>[_ acs-subsite.lt_registration_request_submitted]</p><p>[_ acs-subsite.Thank_you]</p>"
         }
         default {
-            set result(account_message) \
-                "There was a problem authenticating the account. Most likely, the database contains users with no member_state."
+            set result(account_message) [_ acs-subsite.Problem_auth_no_memb]
             ns_log Error "auth::check_local_account_status: problem with registration state machine: user_id $user_id has member_state '$member_state'"
         }
     }
@@ -1418,7 +1417,8 @@
                                -username $username]
         
         if { [empty_string_p $user(user_id)] } {
-            set element_messages(username) "No user with username '$username' found for authority [auth::authority::get_element -authority_id $authority_id -element pretty_name]"
+    set this_authority [auth::authority::get_element -authority_id $authority_id -element pretty_name]
+            set element_messages(username) [_ acs-subsite.Username_not_found_for_authority]
         }
     } else {
         set user(username) $username
@@ -1436,7 +1436,7 @@
 
     if { [exists_and_not_null user(email)] } { 
         if { ![util_email_valid_p $user(email)] } {
-            set element_messages(email) "This is not a valid email address"
+            set element_messages(email) [_ acs-subsite.Not_valid_email_addr]
         } else {
             set user(email) [string tolower $user(email)]
         }
@@ -1455,7 +1455,7 @@
     if { [info exists user(screen_name)] } {
         set screen_name_user_id [acs_user::get_user_id_by_screen_name -screen_name $user(screen_name)]
         if { ![empty_string_p $screen_name_user_id] && (!$update_p || $screen_name_user_id != $user(user_id)) } {
-            set element_messages(screen_name) "This screen name is already taken."
+            set element_messages(screen_name) [_ acs-subsite.screen_name_already_taken]
 
             # We could do the same logic as below with 'stealing' the screen_name of an old, banned user.
         }
@@ -1471,7 +1471,7 @@
             # or it's not the same user_id as the one we're updating
             
             if { ![string equal [acs_object_type $email_party_id] "user"] } {
-                set element_messages(email) "We already have a group with this email"
+                set element_messages(email) [_ acs-subsite.Have_group_mail]
             } else {
                 acs_user::get \
                     -user_id $email_party_id \
@@ -1486,7 +1486,7 @@
                             -email "dummy-email-$email_party_id"
                     }
                     default { 
-                        set element_messages(email) "We already have a user with this email."
+                        set element_messages(email) [_ acs-subsite.Have_user_mail]
                     }
                 } 
             }
@@ -1511,7 +1511,7 @@
                         -username "dummy-username-$username_user_id"
                 }
                 default { 
-                    set element_messages(username) "We already have a user with this username."
+                    set element_messages(username) [_ acs-subsite.Have_user_name]
                 }
             }
         }
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.60 -r1.61
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	1 Mar 2005 14:46:44 -0000	1.60
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	13 Mar 2005 23:51:13 -0000	1.61
@@ -24,6 +24,7 @@
       &lt;a href=&quot;%login_url%&quot;&gt;Log in&lt;/a&gt; again to see what you can do about it.
     &lt;/p&amp;;gt;
   </msg>
+  <msg key="Account_not_avail_now">This account is not available at this time.</msg>
   <msg key="Account_reopened_message">Your account at %system_name% has been reopened. Welcome back.</msg>
   <msg key="Account_reopened_title">Account Reopened</msg>
   <msg key="Action">Action</msg>
@@ -38,6 +39,7 @@
   <msg key="Applications">Applications</msg>
   <msg key="Approve">Approve</msg>
   <msg key="at">at</msg>
+  <msg key="Auth_internal_error">Internal error during authentication</msg>
   <msg key="Authority">Authority</msg>
   <msg key="Bad_Password">Bad Password</msg>
   <msg key="Ban">Ban</msg>
@@ -127,6 +129,7 @@
   <msg key="email_dont_show_admin">Don't show E-mail</msg>
   <msg key="email_not_available">Not available</msg>
   <msg key="Email_not_Requested">Email not Requested</msg>
+  <msg key="Email_required">Email required</msg>
   <msg key="email_subject_Forgotten_password">Your forgotten password on %system_name%</msg>
   <msg key="email_subject_Registration_password">Welcome to %system_name%</msg>
   <msg key="Enabled">Enabled</msg>
@@ -135,6 +138,9 @@
   <msg key="erase_portrait">erase portrait</msg>
   <msg key="Error">Error</msg>
   <msg key="Error_sending_mail">Error sending mail</msg>
+  <msg key="Error_sending_verification_mail">We got an error sending out the email for email verification</msg>
+  <msg key="Error_trying_to_register">We experienced an error while trying to register an account for you.</msg>
+  <msg key="Error_update_account_info">We experienced an error while trying to update the account information</msg>
   <msg key="Expires">Expires</msg>
   <msg key="Filename">Filename</msg>
   <msg key="First_names">First names</msg>
@@ -145,6 +151,10 @@
   <msg key="go_upload_your_portrait">go upload your portrait</msg>
   <msg key="Grant">Grant</msg>
   <msg key="Grant_Permission">Grant Permission</msg>
+  <msg key="Have_group_mail">We already have a group with this email</msg>
+  <msg key="Have_user_mail">We already have a user with this email.</msg>
+  <msg key="Have_user_name">We already have a user with this username.</msg>
+  <msg key="Help_information">&lt;p&gt;&lt;h3&gt;Help Information&lt;/h3&gt;</msg>
   <msg key="Hide">Hide</msg>
   <msg key="Home_page">Home page</msg>
   <msg key="If_you_were_to">If you were to</msg>
@@ -279,10 +289,12 @@
   <msg key="no_portrait_title_message">your portrait</msg>
   <msg key="No_pretty_plural">No %pretty_plural%</msg>
   <msg key="No_services">No services</msg>
+  <msg key="No_user_with_this_username">No user found with this username</msg>
   <msg key="none">none</msg>
   <description key="none">Used to indicate that a list of permissions or objects is empty.</description>
 
   <msg key="Not_logged_in">Not logged in</msg>
+  <msg key="Not_valid_email_addr">This is not a valid email address</msg>
   <msg key="Notes">Notes:</msg>
   <msg key="Notice">Notice:</msg>
   <msg key="on_name_to">on %name% to:</msg>
@@ -310,12 +322,16 @@
 
 3. Choose &quot;%password_update_link_text%&quot;</msg>
   <msg key="Password_changed_subject">Password changed</msg>
+  <msg key="Password_regular_change_now">Your password must be changed
+  regularly. Please change your password now.</msg>
+  <msg key="Passwords_dont_match">Passwords don't match</msg>
   <msg key="perm_cannot_be_removed">This permission cannot be removed.</msg>
   <msg key="Permissions">Permissions</msg>
   <msg key="permissions">permissions</msg>
   <msg key="Permissions_for_name">Permissions for %name%</msg>
   <msg key="Please_return_to_home">Please return to %home_link%.</msg>
   <msg key="Portrait">Portrait</msg>
+  <msg key="Problem_auth_no_memb">There was a problem authenticating the account.  Most likely, the database contains users with no member_state.</msg>
   <msg key="Profile">Profile</msg>
   <msg key="Question">Question</msg>
   <msg key="Re_enable">Re-enable</msg>
@@ -338,6 +354,7 @@
   <msg key="Role">Role</msg>
   <msg key="Save_comment">Save comment</msg>
   <msg key="Screen_name">Screen name</msg>
+  <msg key="Screen_name_already_taken">This screen name is already taken.</msg>
   <msg key="Search_For_Exist_User">Search For An Existing User</msg>
   <msg key="Security_context_root">Security context root</msg>
   <msg key="Select_an_Object_by_Id">Select an Object by Id:</msg>
@@ -355,6 +372,7 @@
   <msg key="subsite">subsite</msg>
   <msg key="Subsites">Subsites</msg>
   <msg key="subsites">subsites</msg>
+  <msg key="Success_but_no_account_yet">You have successfully authenticated, but you do not have an account on %system_name% yet.</msg>
   <msg key="Thank_you">Thank you.</msg>
   <msg key="The_ISO_codes_were_not">The ISO codes were not loaded on this server.</msg>
   <msg key="This_group_is_closed">This group is closed. New members can only get access by invitation.</msg>
@@ -364,6 +382,7 @@
 </msg>
   <msg key="Topic">Topic</msg>
   <msg key="type_specific_info">type-specific info</msg>
+  <msg key="Unknown_email">Unknown email</msg>
   <msg key="UP">UP</msg>
   <description key="UP">Can we please have a description of this key??</description>
 
@@ -375,6 +394,8 @@
   <msg key="upload_a_replacement_por">upload a replacement portrait</msg>
   <msg key="Upload_Portrait">Upload Portrait</msg>
   <msg key="Username">Username</msg>
+  <msg key="Username_not_found_for_authority">No user with username '%username%' found for authority %this_authority%</msg>
+  <msg key="Username_required">Username required</msg>
   <msg key="UserSiteMap">User's Site Map</msg>
   <msg key="Vacation_Info_Updated">Vacation Information Updated</msg>
   <msg key="Vacation_information_updated">Your vacation information at %site_link% has been updated.</msg>