Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml 7 Nov 2002 18:06:54 -0000 1.1
@@ -0,0 +1,29 @@
+
+
+
" if [string equal $children_p "t"] { @@ -127,7 +127,7 @@ } { doc_body_append "$c_name \n" } if_no_rows { - doc_body_append " (none)\n" + doc_body_append " ([_ acs-subsite.none])\n" } doc_body_append "" @@ -145,9 +145,9 @@ } set children_p "t" - doc_body_append "$num_children Children Hidden " + doc_body_append "[_ acs-subsite.lt_num_children_Children] " if {$num_children > 0} { - doc_body_append "\[Show\] " + doc_body_append "\[[_ acs-subsite.Show]\] " } } Index: openacs-4/packages/acs-subsite/www/pvt/home.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/pvt/home.adp 6 Sep 2002 21:50:08 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/pvt/home.adp 7 Nov 2002 18:06:56 -0000 1.5 @@ -6,65 +6,58 @@-
Log Out + #acs-subsite.Log_Out# -
Change my Password + #acs-subsite.Change_my_Password# - What we tell other users about you
+#acs-subsite.lt_What_we_tell_other_us#
-In general we identify content that you've posted by your full name. -In an attempt to protect you from unsolicited bulk email (spam), we -keep your email address hidden except from other registered users. -Total privacy is technically feasible but an important element of an -online community is that people can learn from each other. So we try -to make it possible for users with common interests to contact each -other. +#acs-subsite.lt_In_general_we_identif#-If you want to check what other users of this service are shown, visit -@member_link@ +#acs-subsite.lt_If_you_want_to_check_# -
Basic Information
+#acs-subsite.Basic_Information#
-
-- Name: @full_name@
-- email address: @email@
-- personal URL: @url@
-- screen name: @screen_name@
-- bio: @bio@
+- #acs-subsite.Name# @full_name@
+- #acs-subsite.email_address# @email@
+- #acs-subsite.personal_URL# @url@
+- #acs-subsite.screen_name# @screen_name@
+- #acs-subsite.bio# @bio@
(update)
+- Your Portrait
-Show everyone else at @system_name@ how great looking you are: upload a portrait +#acs-subsite.Your_Portrait#
+#acs-subsite.lt_Show_everyone_else_at# #acs-subsite.upload_a_portrait#- -Your Portrait
-On @portrait_publish_date@, you uploaded @portrait_title@. +#acs-subsite.Your_Portrait#
+#acs-subsite.lt_On_portrait_publish_d#.If you're getting too much email from us
+#acs-subsite.lt_If_youre_getting_too_#
-Then you should either +#acs-subsite.lt_Then_you_should_eithe# -or
+#acs-subsite.or#
-
Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,10 +1,9 @@- Unsubscribe (for a period of vacation or permanently)
+- #acs-subsite.Unsubscribe# (#acs-subsite.lt_for_a_period_of_vacat#)
- Awaiting Approval +#acs-subsite.Awaiting_Approval# -Your registration request has been submitted -to the @system_name@ administrator. It is still -waiting approval.
+#acs-subsite.lt_registration_request_submitted#
-Thank you.
+#acs-subsite.Thank_you#
+ Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl 18 Sep 2002 12:16:48 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl 7 Nov 2002 18:06:57 -0000 1.4 @@ -11,7 +11,7 @@ if {![db_0or1row register_member_state_information "select member_state, email, email_verified_p, rel_id from cc_users where user_id = :user_id and (member_state is null or member_state = 'rejected' or member_state = 'needs approval')"]} { - ad_return_error "Couldn't find your record" "User id $user_id is not in the awaiting approval state. This is probably our programming bug." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_User_id_user_id_is_no]" return } Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,8 +1,8 @@- Awaiting email verification +#acs-subsite.lt_Awaiting_email_verifi# -Registration information for this service has just been -sent to @email@.
-Please read and follow the instructions in this email.
+#acs-subsite.lt_Registration_informat#
+#acs-subsite.lt_Please_read_and_follo#
+ Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 18 Sep 2002 12:16:48 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 7 Nov 2002 18:06:57 -0000 1.5 @@ -15,7 +15,7 @@ where user_id = :user_id and email_verified_p = 'f' }]} { ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification" - ad_return_error "Couldn't find your record" "User id $user_id is not found in the need email verification state." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_User_id_user_id_is_no_1]" ad_script_abort } @@ -44,5 +44,7 @@ ad_return_template # Send them the mail for them to come back and activate their account -ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm?[export_url_vars row_id]" - +# Variables used in the email message +set system_name [ad_system_name] +set confirmation_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm?[export_url_vars row_id]" +ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "[_ acs-subsite.lt_Welcome_to_system_nam]" "[_ acs-subsite.lt_To_confirm_your_regis]" Index: openacs-4/packages/acs-subsite/www/register/bad-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/bad-password.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/bad-password.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,15 +1,13 @@- Bad Password -in @system_name@ +#acs-subsite.Bad_Password# +#acs-subsite.in# @system_name@ -The password you typed doesn't match what we have in the database. -If you think you made a typo, please back up using your browser and -try again.
+#acs-subsite.lt_The_password_you_type#
- + + Index: openacs-4/packages/acs-subsite/www/register/bad-password.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/bad-password.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/bad-password.tcl 7 Nov 2002 18:06:57 -0000 1.2 @@ -16,4 +16,6 @@ set system_name [ad_system_name] -ad_return_template \ No newline at end of file +set email_password_url "email-password?user_id=$user_id" + +ad_return_template Index: openacs-4/packages/acs-subsite/www/register/banned-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/banned-user.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/banned-user.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/banned-user.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,6 +1,7 @@If you've forgotten your password, you can - ask this server to reset - your password and email a new randomly generated password to you.
+#acs-subsite.lt_If_youve_forgotten_yo#
- Sorry +#acs-subsite.Sorry# -Sorry but it seems that you've been banned from @system_name@. +#acs-subsite.lt_Sorry_but_it_seems_th# + Index: openacs-4/packages/acs-subsite/www/register/banned-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/banned-user.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/banned-user.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/banned-user.tcl 7 Nov 2002 18:06:57 -0000 1.2 @@ -13,16 +13,16 @@ select member_state from cc_users where user_id = :user_id } ]} { - ad_return_error "Couldn't find your record" "User id $user_id is not in the database. This is probably our programming bug." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec_1]" return } if { ![string equal $member_state "banned"] } { - ad_return_error "Problem with user authentication" "You have encountered a problem with authentication." + ad_return_error "[_ acs-subsite.lt_Problem_with_user_aut]" "[_ acs-subsite.lt_You_have_encountered_]" return } -# User is truely banned +# User is truly banned db_release_unused_handles set system_name [ad_system_name] Index: openacs-4/packages/acs-subsite/www/register/deleted-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/deleted-user.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/deleted-user.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/deleted-user.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,9 +1,11 @@- Welcome Back -to @site_link@ +#acs-subsite.Welcome_Back# +#acs-subsite.to_site_link# -Your account is currently marked "deleted". If you wish, we -can restore your account to live status. +#acs-subsite.Welcome_Back_1# #acs-subsite.to_site_link_1#. + + + Index: openacs-4/packages/acs-subsite/www/register/deleted-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/deleted-user.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/deleted-user.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/deleted-user.tcl 7 Nov 2002 18:06:57 -0000 1.2 @@ -15,14 +15,14 @@ select member_state from cc_users where user_id = :user_id }] } { - ad_return_error "Couldn't find your record" "User id $user_id is not in the database. This is probably our programming bug." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_User_id_user_id_is_no_2]" return } db_release_unused_handles if { $member_state != "deleted" } { - ad_return_error "Problem with authentication" "You have encountered a problem with authentication" + ad_return_error "[_ acs-subsite.lt_Problem_with_authenti]" "[_ acs-subsite.lt_You_have_encountered__1]" } set site_link [ad_site_home_link] Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-confirm.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,45 +1,41 @@- Email Confirmation +#acs-subsite.Email_Confirmation# - Your email is confirmed
- at @site_link@ +#acs-subsite.lt_Your_email_is_confirm#
+ #acs-subsite.at# @site_link@
- Your email has been confirmed. You may now log into - @system_name@. + #acs-subsite.lt_Your_email_has_been_c#
- Note: If you've forgotten your password, ask this server to email it - to @email@. + #acs-subsite.lt_Note_If_youve_forgott_1#.
- Your email is confirmed
- at @site_link@ +#acs-subsite.lt_Your_email_is_confirm#
+ #acs-subsite.at# @site_link@
- Your email has been confirmed. You are now awaiting approval - from the @system_name@ administrator. + #acs-subsite.lt_Your_email_has_been_c_1#- Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 12 May 2002 20:57:02 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 7 Nov 2002 18:06:57 -0000 1.4 @@ -31,7 +31,7 @@ if { $status != 0 || $rowid_check == 0} { db_release_unused_handles - ad_return_error "Couldn't find your record" "Row id $row_id is not in the database. Please check your email and verifiy that you have cut and pasted the url correctly." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_Row_id_row_id_is_not_]" return } Index: openacs-4/packages/acs-subsite/www/register/email-for-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-for-password.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-for-password.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-for-password.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,7 +1,8 @@Email not Requested
+#acs-subsite.Email_not_Requested#
-We were not awaiting your email. There must be some mistake. +
#acs-subsite.lt_We_were_not_awaiting_# -
Please try to log in again +
#acs-subsite.lt_Please_try_to_a_hrefi#
- Forgotten Password / Enter Your Email -"email password" +#acs-subsite.lt_Forgotten_Password__E# +#acs-subsite.email_password# + Index: openacs-4/packages/acs-subsite/www/register/email-password-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-password-2.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-password-2.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,8 +1,7 @@- Check Your Inbox +#acs-subsite.Check_Your_Inbox# -Please check your inbox. Within the next few minutes, you should find -a message from @system_owner@ containing your password. +#acs-subsite.lt_Please_check_your_inb#
@@ -14,21 +13,20 @@ - for future reference, please type in a question and an answer to use as - verification. + #acs-subsite.lt_for_future_reference_#
- question:
- answer:
+ #acs-subsite.question#
+ #acs-subsite.answer#
- +- Then come back to the login page and use - @system_name@. + #acs-subsite.lt_Then_come_back_to_a_h# + Index: openacs-4/packages/acs-subsite/www/register/email-password-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/register/email-password-2.tcl 20 Sep 2002 22:28:54 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/register/email-password-2.tcl 7 Nov 2002 18:06:57 -0000 1.10 @@ -22,13 +22,13 @@ } if {![ad_parameter EmailForgottenPasswordP security 1]} { - ad_return_error "Feature disabled" "This feature is disabled on this server." + ad_return_error "[_ acs-subsite.Feature_disabled]" "[_ acs-subsite.lt_This_feature_is_disab]" return } if {![db_0or1row select_email {}]} { db_release_unused_handles - ad_return_error "Couldn't find user $user_id" "Couldn't find user $user_id. This is probably a bug in our code." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_user_use]" "[_ acs-subsite.lt_Couldnt_find_user_use_1]" return } @@ -51,8 +51,8 @@ if {!$validated_p} { ad_return_error \ - "Unauthorized Access" \ - "The validation didn't match what we had. Either press back on the browser and retype it in, or go back to the login page." + "[_ acs-subsite.Unauthorized_Access]" \ + "[_ acs-subsite.lt_The_validation_didnt_]" return } @@ -64,28 +64,25 @@ set system_owner [ad_system_owner] set system_name [ad_system_name] +set reset_password_url "[ad_url]/user/password-update?[export_vars {user_id {password_old $password}}]" -set subject "Your forgotten password on $system_name" -set body "Please follow the following link to reset your password: +set subject "[_ acs-subsite.lt_Your_forgotten_passwo]" +set body "[_ acs-subsite.lt_Please_follow_the_fol]" -[ad_url]/user/password-update?[export_vars {user_id {password_old $password}}] - -" - # Send email if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] { ad_return_error \ - "Error sending mail" \ - "Now we're really in trouble because we got this error: + "[_ acs-subsite.Error_sending_mail]" \ + "[_ acs-subsite.lt_Now_were_really_in_tr]-when trying to send you the following email: +[_ acs-subsite.lt_when_trying_to_send_y]$errmsg-Subject: $subject +[_ acs-subsite.Subject] $subject $bodyIndex: openacs-4/packages/acs-subsite/www/register/email-password-3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-password-3.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-password-3.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,8 +1,8 @@- Customized Question/Answer Entered +#acs-subsite.lt_Customized_QuestionAn# -Please Wait for our Email
+#acs-subsite.lt_Please_Wait_for_our_E#
-When you get your email, go back -to the login page and use -@system_name@.
+#acs-subsite.lt_When_you_get_your_ema#
+ + Index: openacs-4/packages/acs-subsite/www/register/email-password-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/email-password-3.tcl 10 Sep 2002 22:22:12 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/email-password-3.tcl 7 Nov 2002 18:06:57 -0000 1.4 @@ -17,17 +17,17 @@ } if {![db_0or1row select_person_name {}]} { - ad_return_error "Couldn't find user $user_id" "Couldn't find user $user_id. This is probably a bug in our code." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_user_use]" "[_ acs-subsite.lt_Couldnt_find_user_use_1]" return } if {![string equal -nocase $first_names $db_first_names] && ![string equal -nocase $last_name $db_last_name]} { - ad_return_error "Validation Check Failed" "The full name given didn't match. There must be something wrong." + ad_return_error "[_ acs-subsite.lt_Validation_Check_Fail]" "[_ acs-subsite.lt_The_full_name_given_d]" return } if {![empty_string_p $password_question]} { - ad_return_error "Customized question already there" "Customized question is already entered" + ad_return_error "[_ acs-subsite.lt_Customized_question_a]" "[_ acs-subsite.lt_Customized_question_i]" return } Index: openacs-4/packages/acs-subsite/www/register/email-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-password.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-password.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,14 +1,14 @@- Email Password +#acs-subsite.Email_Password# -Please verify your identity by providing the information below:
+#acs-subsite.lt_Please_verify_your_id#
+ Index: openacs-4/packages/acs-subsite/www/register/email-password.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/email-password.tcl 10 Sep 2002 22:22:12 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/email-password.tcl 7 Nov 2002 18:06:57 -0000 1.5 @@ -12,7 +12,7 @@ } if {![ad_parameter EmailForgottenPasswordP security 1]} { - ad_return_error "Feature disabled" "This feature is disabled on this server." + ad_return_error "[_ acs-subsite.Feature_disabled]" "[_ acs-subsite.lt_This_feature_is_disab]" return } Index: openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,22 +1,17 @@- Saving email address and password -at @home_link@ +#acs-subsite.lt_Saving_email_address_# +#acs-subsite.at# @home_link@ -Our server can tell your browser to remember certain things, such as -your email address and password. This is convenient for you because, -if you're the only person who uses your computer, you won't have to -keep telling us your email address and password. +#acs-subsite.lt_Our_server_can_tell_y#
-It would be a very bad idea to choose this option if you're using a -shared computer in a library or school. Any subsequent user of this -machine would be able to masquerade as you on our service. +#acs-subsite.lt_It_would_be_a_very_ba#
-Note that you can erase your saved email address and password by -choosing the "log out" option from your workspace. +#acs-subsite.lt_Note_that_you_can_era#
+ Index: openacs-4/packages/acs-subsite/www/register/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/index.adp 6 Sep 2002 21:50:09 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/index.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,56 +1,43 @@- Log In -login.email -to @system_name@ +#acs-subsite.Log_In# +login.email +#acs-subsite.to# @system_name@ -Current users: Please enter your email and password below.
-New users: Welcome to @system_name@. Please begin the -registration process by entering a valid email address and a -password for signing into the system. We will direct you to another form to -complete your registration.
+#acs-subsite.Current_users# #acs-subsite.lt_Please_enter_your_ema#
+#acs-subsite.New_users# #acs-subsite.lt_welcome_please_register#
-- -Have you forgotten your password? -
++ -#acs-subsite.lt_Have_you_a_hrefemail-#
If you keep getting thrown back here, it is probably because your -browser does not accept cookies. We're sorry for the inconvenience -but it really is impossible to program a system like this without -keeping track of who is posting what.
--In Netscape 4.0, you can enable cookies from Edit -> Preferences --> Advanced. In Microsoft Internet Explorer 4.0, you can enable cookies from View -> Internet Options -> Advanced -> Security. -
+#acs-subsite.lt_no_cookies#
+#acs-subsite.lt_enable_cookies#
+ Index: openacs-4/packages/acs-subsite/www/register/login-expired.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-expired.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/login-expired.adp 20 Sep 2002 22:28:54 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/login-expired.adp 7 Nov 2002 18:06:57 -0000 1.5 @@ -1,16 +1,17 @@- Login Expired +#acs-subsite.Login_Expired# -The login page has expired. Please login again.
+#acs-subsite.Login_Expired_1# #acs-subsite.login# #acs-subsite.again#.
+ + + Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/restore-user.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/restore-user.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,22 +1,21 @@
- Note: For security reasons, the login page expires - after a certain interval to prevent malicious attackers from - logging in as you using previously entered passwords. + #acs-subsite.Note# #acs-subsite.lt_For_security_reasons_# - Your Account is Restored +#acs-subsite.lt_Your_Account_is_Resto# -Your Account at @site_link@ is restored.
+#acs-subsite.lt_Your_Account_at_site_#
-You can log in now using your old -password: +
#acs-subsite.lt_You_can_log_in_now_us#
-Note: If you've forgotten your password, ask this server to email it -to @email@. +#acs-subsite.lt_Note_If_youve_forgott#.
+ Index: openacs-4/packages/acs-subsite/www/register/restore-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/register/restore-user.tcl 20 Sep 2001 22:44:46 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl 7 Nov 2002 18:06:57 -0000 1.3 @@ -12,7 +12,7 @@ if {![db_0or1row user_state_info { select member_state, email, rel_id from cc_users where user_id = :user_id }]} { - ad_return_error "Couldn't find your record" "User id $user_id is not in the database. This is probably out programming bug." + ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_User_id_user_id_is_no_3]" return } @@ -29,7 +29,7 @@ } } else { - ad_return_error "Problem with authentication" "There was a problem with authenticating your account" + ad_return_error "[_ acs-subsite.lt_Problem_with_authenti]" "[_ acs-subsite.lt_There_was_a_problem_w]" } set site_link [ad_site_home_link] @@ -46,4 +46,6 @@ set export_vars [export_form_vars return_url time token_id hash email] +set email_password_url "email-password.tcl?user_id=$user_id" + ad_return_template Index: openacs-4/packages/acs-subsite/www/register/user-join.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/user-join.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/user-join.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -1,5 +1,6 @@- Join @group_name@ +#acs-subsite.Join_group_name# @context@ + 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.2 -r1.3 --- openacs-4/packages/acs-subsite/www/register/user-join.tcl 6 Sep 2002 21:50:09 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/register/user-join.tcl 7 Nov 2002 18:06:57 -0000 1.3 @@ -18,7 +18,7 @@ } -validate { rel_type_valid_p { if {![relation_type_is_valid_to_group_p -group_id $group_id $rel_type]} { - ad_complain "Cannot join this group." + ad_complain "[_ acs-subsite.lt_Cannot_join_this_grou]" } } } @@ -31,14 +31,14 @@ } if {[string equal $join_policy closed]} { - ad_complain "Cannot join this group." + ad_complain "[_ acs-subsite.lt_Cannot_join_this_grou]" } set export_var_list [list group_id rel_type return_url] set party_id [ad_conn user_id] -set context [list "Join $group_name"] +set context [list "[_ acs-subsite.Join_group_name]"] template::form create join @@ -91,7 +91,7 @@ set required_seg [template::multirow get required_segments $rownum] if {[string equal $required_segments(join_policy) closed]} { - ad_complain "Cannot join this group." + ad_complain "[_ acs-subsite.lt_Cannot_join_this_grou]" return } @@ -122,7 +122,7 @@ } } on_error { - ad_return_error "Error creating the relation" "We got the following error message while trying to create this relation: $errmsg" + ad_return_error "[_ acs-subsite.lt_Error_creating_the_re]" "[_ acs-subsite.lt_We_got_the_following_]$errmsg" ad_script_abort } Index: openacs-4/packages/acs-subsite/www/register/user-new-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/user-new-2.adp 6 Sep 2002 21:50:09 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/user-new-2.adp 7 Nov 2002 18:06:57 -0000 1.4 @@ -3,26 +3,23 @@- Please read your email
+#acs-subsite.lt_Please_read_your_emai#
-Registration information for this service has been -sent to @email@. +#acs-subsite.lt_Registration_informat_1#
-Please read and follow the instructions in this email. +#acs-subsite.lt_Please_read_and_follo#
- + Index: openacs-4/packages/acs-subsite/www/register/user-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/www/register/user-new-2.tcl 28 Oct 2002 12:36:28 -0000 1.8 +++ openacs-4/packages/acs-subsite/www/register/user-new-2.tcl 7 Nov 2002 18:06:57 -0000 1.9 @@ -29,12 +29,12 @@ if {[info exists first_names] && [string first "<" $first_names] != -1} { incr exception_count - append exception_text "Awaiting Approval
+#acs-subsite.Awaiting_Approval#
-Your registration is in the database now. A site administrator has -been notified of your request to use the system. Once you're -approved, you'll get an email message and you can return to -@site_link@ to use the service. +#acs-subsite.lt_Your_registration_is_#You can't have a < in your first name because it will look like an HTML tag and confuse other users." + append exception_text " [_ acs-subsite.lt_You_cant_have_a_lt_in]" } if {[info exists last_name] && [string first "<" $last_name] != -1} { incr exception_count - append exception_text " You can't have a < in your last name because it will look like an HTML tag and confuse other users." + append exception_text " [_ acs-subsite.lt_You_cant_have_a_lt_in_1]" } if { [info exists url] && [string compare $url "http://"] == 0 } { @@ -43,17 +43,11 @@ } elseif { ![util_url_valid_p $url] } { # there is a URL but it doesn't match our REGEXP incr exception_count - append exception_text " You URL doesn't have the correct form. A valid URL would be something like \"http://photo.net/philg/\"." -} - -if {[ad_parameter RegistrationProvidesRandomPasswordP security 0]} { - set password [ad_generate_random_string] -} elseif { ![info exists password] || [empty_string_p $password] } { - incr exception_count - append exception_text " You haven't provided a password.\n" + set valid_url_example "http://photo.net/philg/" + append exception_text " [_ acs-subsite.lt_Your_URL_doesnt_have_]\n" } elseif { [string compare $password $password_confirmation] } { incr exception_count - append exception_text " The passwords you've entered don't match.\n" + append exception_text " [_ acs-subsite.lt_The_passwords_youve_e]\n" } # We've checked everything. @@ -85,7 +79,7 @@ } else { set user_id [ad_user_new $email $first_names $last_name $password $question $answer $url $email_verified_p $member_state $user_id] if { !$user_id } { - ad_return_error "User Creation Failed" "We were unable to create your user record in the database." + ad_return_error "[_ acs-subsite.User_Creation_Failed]" "[_ acs-subsite.lt_We_were_unable_to_cre]" ad_script_abort } @@ -112,7 +106,7 @@ # so don't give an auth cookie, but instead tell him # to read your email - set title "Please read your email" + set title "[_ acs-subsite.lt_Please_read_your_emai]" ad_return_template } elseif { $member_state == "needs approval" } { @@ -121,7 +115,7 @@ # approved him, so don't give an auth cookie, but instead tell him # to wait - set title "Awaiting Approval" + set title "[_ acs-subsite.Awaiting_Approval]" set site_link [ad_site_home_link] ad_return_template @@ -130,6 +124,10 @@ set notification_address [ad_parameter NewRegistrationEmailAddress "security" [ad_system_owner]] set errmsg {} +# Variables needed in various messages to the user below +set system_name [ad_system_name] +set system_url [ad_url] + if { !$double_click_p } { if { $email_verified_p == "f" } { @@ -141,11 +139,7 @@ } elseif { [ad_parameter RegistrationProvidesRandomPasswordP "security" 0] || [ad_parameter EmailRegistrationConfirmationToUserP "security" 0] } { with_catch errmsg { - ns_sendmail $email $notification_address "Thank you for visiting [ad_system_name]" "Here's how you can log in at [ad_url]: - -Username: $email -Password: $password -" + ns_sendmail $email $notification_address "[_ acs-subsite.lt_Thank_you_for_visitin]" } { ns_returnerror "error" "$error" ns_log Warning "Error sending registration confirmation to $email in user-new-2" @@ -154,11 +148,9 @@ if {[ad_parameter NotifyAdminOfNewRegistrationsP "security" 0]} { # we're supposed to notify the administrator when someone new registers - ns_sendmail $notification_address $email "New registration at [ad_url]" " -$first_names $last_name ($email) registered as a user of -[ad_url] + ns_sendmail $notification_address $email "[_ acs-subsite.lt_New_registration_at_s]" "[_ acs-subsite.lt_first_names_last_name] $errmsg -" +#>" } } Index: openacs-4/packages/acs-subsite/www/register/user-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/register/user-new.adp 6 Sep 2002 21:50:09 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/register/user-new.adp 7 Nov 2002 18:06:57 -0000 1.7 @@ -1,82 +1,77 @@ - Register +#acs-subsite.Register# -Register as a user of @system_name@ +#acs-subsite.lt_Register_as_a_user_of# @system_name@ + Index: openacs-4/packages/acs-subsite/www/user/password-update.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/www/user/password-update.adp 6 Sep 2002 21:50:12 -0000 1.8 +++ openacs-4/packages/acs-subsite/www/user/password-update.adp 7 Nov 2002 18:06:58 -0000 1.9 @@ -1,6 +1,6 @@- Update Password -for @first_names@ @last_name@ in @site_link@ +#acs-subsite.Update_Password# +#acs-subsite.lt_for_first_names_last_#