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.35 -r1.36 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 12 Oct 2003 18:21:21 -0000 1.35 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 12 Oct 2003 19:50:30 -0000 1.36 @@ -18,12 +18,18 @@ </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="Add_new_app">Add new application</msg> <msg key="Admin">Admin</msg> + <msg key="Administer_subsite">Administer %subsite_name%</msg> <msg key="Answer">Answer</msg> + <msg key="Applications">Applications</msg> + <msg key="Approve">Approve</msg> <msg key="at">at</msg> <msg key="Bad_Password">Bad Password</msg> + <msg key="Ban">Ban</msg> <msg key="Basic_Information">Basic Information</msg> <msg key="cannot_retrieve_password">Retrieving password from local authority is not supported.</msg> + <msg key="Cannot_see_memb_list">Cannot see the members list</msg> <msg key="Change_locale_label">Change language</msg> <msg key="Change_my_Password">Change my Password</msg> <msg key="Change_pass_email_por">Change password, email, portrait</msg> @@ -41,11 +47,16 @@ logging in again. </p> </msg> <msg key="Close_your_account">Close your account</msg> + <msg key="communities">communities</msg> + <msg key="Communities">Communities</msg> + <msg key="community">community</msg> <msg key="Confirm">Confirm</msg> + <msg key="Create_new_community">Create new %pretty_name%</msg> <msg key="Current_Password">Current Password</msg> <msg key="Currently_invisible_msg"><p> Your online status is currently not visible to other users. </p></msg> <msg key="Currently_visible_msg"><p> Your online status is currently visible to other users. </p></msg> <msg key="Customize_Question">Customize Question</msg> + <msg key="Delete">Delete</msg> <msg key="DevAdmin">DevAdmin</msg> <msg key="Developers_Admin">Developer's Administration</msg> <msg key="Direct_Permissions">Direct Permissions</msg> @@ -78,8 +89,13 @@ <msg key="First_names">First names</msg> <msg key="Grant">Grant</msg> <msg key="Grant_Permission">Grant Permission</msg> + <msg key="Invite">Invite</msg> + <msg key="Join_community">Join community</msg> <msg key="Join_group_name">Join %group_name%</msg> + <msg key="Join_this_community">Join this community</msg> <msg key="Last_name">Last name</msg> + <msg key="Leave_community">Leave community</msg> + <msg key="Leave_this_community">Leave this community</msg> <msg key="Login_or_register">Login or register</msg> <msg key="Log_In">Log In</msg> <msg key="Log_in_to_system">Log in to %system_name%</msg> @@ -130,11 +146,19 @@ from the %system_name% administrator.</msg> <msg key="lt_Your_email_is_confirm">Your email is confirmed</msg> <msg key="lt_Your_URL_doesnt_have_">Your URL doesn't have the correct form. A valid URL would be something like "%valid_url_example%".</msg> + <msg key="Make_administrator">Make administrator</msg> + <msg key="Make_member</msg> <msg key="Make_yourself_invisible_label">Make yourself invisible</msg> <msg key="Make_yourself_visible_label">Make yourself visible</msg> <msg key="Manage_your_notifications">Manage your notifications</msg> + <msg key="Members">Members</msg> + <msg key="Member_State">Member State</msg> + <msg key="Mem_list_not_allowed">Sorry, but you are not allowed to view the members list.</msg> + <msg key="Name">Name</msg> <msg key="New_Password">New Password</msg> <msg key="Not_logged_in">Not logged in</msg> + <msg key="No_applications">No applications</msg> + <msg key="No_pretty_plural">No %pretty_plural%</msg> <msg key="no_portrait_title_message">your portrait</msg> <msg key="none">none</msg> <description key="none">Used to indicate that a list of permissions or objects is empty.</description> @@ -167,11 +191,20 @@ <p> Thank you for registering for %system_name%. An administrator has been notified of your request. </p> <p> Once you're approved, you'll get an email message and you can return to start using %system_name%. </p> </msg> + <msg key="Remove">Remove</msg> + <msg key="Reject">Reject</msg> + <msg key="Request_membership">Request membership</msg> + <msg key="Req_membership_comm">Request membership of this community</msg> <msg key="Revoke_Checked">Revoke Checked</msg> + <msg key="Role">Role</msg> <msg key="Screen_name">Screen name</msg> + <msg key="Send_email_to_this_user">Send email to this user</msg> <msg key="Site_wide_administration">Site-wide administration</msg> <msg key="Show">Show</msg> <msg key="sorry_forgotten_pwd">Sorry, we can't help you with your forgotten password.</msg> + <msg key="subcommunities">subcommunities</msg> + <msg key="Subcommunities">Subcommunities</msg> + <msg key="subcommunity">subcommunity</msg> <msg key="Thank_you">Thank you.</msg> <msg key="up_to_context_name">up to %context_name%</msg> <msg key="Update">Update</msg> Index: openacs-4/packages/acs-subsite/lib/applications.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/lib/applications.adp 2 Oct 2003 22:04:46 -0000 1.1 +++ openacs-4/packages/acs-subsite/lib/applications.adp 12 Oct 2003 19:50:30 -0000 1.2 @@ -1,5 +1,5 @@ <p><listtemplate name="applications"></listtemplate></p> <if @add_url@ not nil> - <p> <b>»</b> <a href="@add_url@">Add new application</a> </p> + <p> <b>»</b> <a href="@add_url@">#acs-subsite.Add_new_app#</a> </p> </if> Index: openacs-4/packages/acs-subsite/lib/applications.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/lib/applications.tcl 2 Oct 2003 22:04:46 -0000 1.1 +++ openacs-4/packages/acs-subsite/lib/applications.tcl 12 Oct 2003 19:50:30 -0000 1.2 @@ -6,10 +6,10 @@ list::create \ -name applications \ -multirow applications \ - -no_data "No applications" \ + -no_data "[_ acs-subsite.No_applications]" \ -elements { instance_name { - label "Name" + label "[_ acs-subsite.Name]" link_url_eval {$name/} } } Index: openacs-4/packages/acs-subsite/lib/subsites.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/lib/subsites.adp 3 Oct 2003 09:08:22 -0000 1.2 +++ openacs-4/packages/acs-subsite/lib/subsites.adp 12 Oct 2003 19:50:30 -0000 1.3 @@ -1,5 +1,5 @@ <p><listtemplate name="subsites"></listtemplate></p> <if @add_url@ not nil> - <p> <b>»</b> <a href="@add_url@">Create new @pretty_name@</a> </p> + <p> <b>»</b> <a href="@add_url@">#acs-subsite.Create_new_community#</a> </p> </if> Index: openacs-4/packages/acs-subsite/lib/subsites.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/lib/subsites.tcl 3 Oct 2003 09:08:22 -0000 1.5 +++ openacs-4/packages/acs-subsite/lib/subsites.tcl 12 Oct 2003 19:50:30 -0000 1.6 @@ -1,9 +1,9 @@ if { [string equal [ad_conn package_url] "/"] } { - set pretty_name "community" - set pretty_plural "communities" + set pretty_name [_ acs-subsite.community] + set pretty_plural [_ acs-subsite.communities] } else { - set pretty_name "subcommunity" - set pretty_plural "subcommunities" + set pretty_name [_ acs-subsite.subcommunity] + set pretty_plural [_ acs-subsite.subcommunities] } set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin] @@ -15,14 +15,14 @@ list::create \ -name subsites \ -multirow subsites \ - -no_data "No $pretty_plural" \ + -no_data "[_ acs-subsite.No_pretty_plural [list pretty_plural $pretty_plural]]" \ -elements { instance_name { - label "Name" + label "[_ acs-subsite.Name]" link_url_col url } num_members { - label "\# Members" + label "\# [_ acs-subsite.Members]" html { align right } } } Index: openacs-4/packages/acs-subsite/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-subsite/www/index.adp 10 Oct 2003 16:35:03 -0000 1.15 +++ openacs-4/packages/acs-subsite/www/index.adp 12 Oct 2003 19:50:30 -0000 1.16 @@ -5,29 +5,32 @@ <div style="float: right;"> <if @main_site_p@ false> <if @group_member_p@ true> - <span class="button"><a href="group-leave" class="button" title="Leave this community">Leave community</a></span> + <span class="button"><a href="group-leave" class="button" + title="#acs-subsite.Leave_this_community#">#acs-subsite.Leave_community#</a></span> </if> <else> <if @can_join_p@ true> <if @group_join_policy@ eq "open"> - <a href="register/user-join" class="button" title="Join this community">Join community</a> + <a href="register/user-join" class="button" + title="#acs-subsite.Join_this_community">#acs-subsite.Join_community#</a> </if> <else> - <a href="register/user-join" class="button" title="Request membership of this community">Request membership</a> + <a href="register/user-join" class="button" + title="#acs-subsite.Req_membership_comm#">#acs-subsite.Request_membership#</a> </else> </if> </else> </if> <if @admin_p@ true> - <a href="admin/" class="button" title="Administer @subsite_name@">Admin</a> + <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-subsite.Admin#</a> </if> </div> </if> <table width="100%"> <tr> <td valign="top"> - <h2>Applications</h2> + <h2>#acs-subsite.Applications#</h2> <include src="/packages/acs-subsite/lib/applications"> </td> <td valign="top"> @@ -38,7 +41,7 @@ <if @show_members_page_link_p@> <tr> <td valign="top" colspan="2"> - <p> <b>»</b> <a href="members/">Members</a> </p> + <p> <b>»</b> <a href="members/">#acs-subsite.Members#</a> </p> </td> </tr> </if> Index: openacs-4/packages/acs-subsite/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/acs-subsite/www/index.tcl 10 Oct 2003 09:02:18 -0000 1.14 +++ openacs-4/packages/acs-subsite/www/index.tcl 12 Oct 2003 19:50:30 -0000 1.15 @@ -55,4 +55,5 @@ set can_join_p [expr !$group_admin_p && $group_member_p == 0 && $user_id != 0 && ![string equal $group_join_policy "closed"]] -set communities_label [ad_decode $main_site_p 1 "Communities" "Subcommunities"] +set communities_label [ad_decode $main_site_p 1 "[_ acs-subsite.Communities]" \ + "[_ acs-subsite.Subcommunities]"] Index: openacs-4/packages/acs-subsite/www/members/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/members/index.adp 10 Oct 2003 16:35:03 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/members/index.adp 12 Oct 2003 19:50:31 -0000 1.5 @@ -16,5 +16,5 @@ </if> <else> <h4>@title@</h4> - Sorry, but you are not allowed to view the members list. + #acs-subsite.Mem_list_not_allowed# </else> Index: openacs-4/packages/acs-subsite/www/members/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/members/index.tcl 10 Oct 2003 16:35:03 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/members/index.tcl 12 Oct 2003 19:50:31 -0000 1.8 @@ -15,7 +15,7 @@ } } -set page_title "Members" +set page_title [_ acs-subsite.Members] set context [list $page_title] set group_id [application_group::group_id_from_package_id] @@ -35,7 +35,7 @@ set show_members_list_p 1 } else { set show_members_list_p 0 - set title "Cannot see the members list" + set title [_ acs-subsite.Cannot_see_memb_list] } if { $admin_p } { @@ -49,7 +49,8 @@ set actions {} if { $admin_p || [parameter::get -parameter "MembersCanInviteMembersP" -default 0] } { - set actions { "Invite" member-invite } + set actions [_ acs-subsite.Invite] + lappend actions { member-invite } } # TODO: Pagination @@ -79,50 +80,50 @@ -actions $actions \ -elements { name { - label "Name" + label "[_ acs-subsite.Name]" link_url_eval {[acs_community_member_url -user_id $user_id]} } email { - label "Email" + label "[_ acs-subsite.Email]" link_url_col email_url - link_html { title "Send email to this user" } + link_html { title "[_ acs-subsite.Send_email_to_this_user]" } } rel_role { - label "Role" + label "[_ acs-subsite.Role]" display_template { @members.rel_role_pretty@ <if @members.make_admin_url@ not nil> - (<a href="@members.make_admin_url@">Make administrator</a>) + (<a href="@members.make_admin_url@">#acs-subsite.Make_administrator#</a>) </if> <if @members.make_member_url@ not nil> - (<a href="@members.make_member_url@">Make member</a>) + (<a href="@members.make_member_url@">#acs-subsite.Make_member#</a>) </if> } } member_state_pretty { - label "Member State" + label "[_ acs-subsite.Member_State]" display_template { @members.member_state_pretty@ <if @members.approve_url@ not nil> - (<a href="@members.approve_url@">Approve</a>) + (<a href="@members.approve_url@">#acs-subsite.Approve#</a>) </if> <if @members.reject_url@ not nil> - (<a href="@members.reject_url@">Reject</a>) + (<a href="@members.reject_url@">#acs-subsite.Reject#</a>) </if> <if @members.ban_url@ not nil> - (<a href="@members.ban_url@">Ban</a>) + (<a href="@members.ban_url@">#acs-subsite.Ban#</a>) </if> <if @members.delete_url@ not nil> - (<a href="@members.delete_url@">Delete</a>) + (<a href="@members.delete_url@">#acs-subsite.Delete#</a>) </if> <if @members.remove_url@ not nil> - (<a href="@members.remove_url@">Remove</a>) + (<a href="@members.remove_url@">#acs-subsite.Remove#</a>) </if> } } } -filters { member_state { - label "Member State" + label "[_ acs-subsite.Member_State]" values $member_state_options where_clause { mr.member_state = :member_state @@ -131,15 +132,15 @@ } } -orderby { name { - label "Name" + label "[_ acs-subsite.Name]" orderby "lower(u.first_names || ' ' || u.last_name)" } email { - label "Email" + label "[_ acs-subsite.Email]" orderby "u.email" } rel_role { - label "Role" + label "[_ acs-subsite.Role]" orderby "role.pretty_name" } }