Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.105 -r1.106
--- openacs-4/packages/dotlrn/dotlrn.info 23 Oct 2002 12:38:38 -0000 1.105
+++ openacs-4/packages/dotlrn/dotlrn.info 12 Nov 2002 08:44:04 -0000 1.106
@@ -484,9 +484,9 @@
<parameter datatype="string" min_n_values="1" max_n_values="1" name="default_class_instance_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_bm,dotlrn_syllabus" description="dotLRN applets to add by default to each new community"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="subcommunities_pretty_name" default="#dotlrn.subcommunities_pretty_name#" description="what subcomms are called"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="subcommunities_pretty_plural" default="#dotlrn.subcommunities_pretty_plural#" description="the plural"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_pages_csv" default="#dotlrn.class_page_home_title#,Simple 2-Column;#dotlrn.class_page_calendar_title#,Simple 1-Column;#dotlrn.class_page_file_storage_title#,Simple 1-Column" description="cvs list of the page_name/layout to create"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="club_pages_csv" default="#dotlrn.club_page_home_title#,Simple 2-Column;#dotlrn.club_page_calendar_title#,Simple 1-Column;#dotlrn.club_page_file_storage_title#,Simple 1-Column;#dotlrn.club_page_people_title#,Simple 1-Column" description="same"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="subcomm_pages_csv" default="#dotlrn.subcomm_page_home_title#,Simple 2-Column;#dotlrn.subcomm_page_info_title#,Simple 1-Column;#dotlrn.subcomm_page_calendar_title#,Simple 1-Column;#dotlrn.subcomm_page_file_storage_title#,Simple 1-Column" description="default page names and layouts for subcomms"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_pages_csv" default="#dotlrn.class_page_home_title#,#new-portal.simple_2column_layout_name#;#dotlrn.class_page_calendar_title#,#new-portal.simple_1column_layout_name#;#dotlrn.class_page_file_storage_title#,#new-portal.simple_1column_layout_name#" description="cvs list of the page_name/layout to create"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="club_pages_csv" default="#dotlrn.club_page_home_title#,#new-portal.simple_2column_layout_name#;#dotlrn.club_page_calendar_title#,#new-portal.simple_1column_layout_name#;#dotlrn.club_page_file_storage_title#,#new-portal.simple_1column_layout_name#;#dotlrn.club_page_people_title#,#new-portal.simple_1column_layout_name#" description="same"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="subcomm_pages_csv" default="#dotlrn.subcomm_page_home_title#,#new-portal.simple_2column_layout_name#;#dotlrn.subcomm_page_info_title#,#new-portal.simple_1column_layout_name#;#dotlrn.subcomm_page_calendar_title#,#new-portal.simple_1column_layout_name#;#dotlrn.subcomm_page_file_storage_title#,#new-portal.simple_1column_layout_name#" description="default page names and layouts for subcomms"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="non_member_page_name" default="#dotlrn.non_member_page_name#" description="The name of the not a member page"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="admin_page_name" default="#dotlrn.admin_page_name#" description="The name of the admin page"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="default_club_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm" description="the applets to add when making a new club"/>
@@ -495,9 +495,8 @@
<parameter datatype="number" min_n_values="1" max_n_values="1" name="show_portrait_p" default="0" description="show or hide all portrait related stuff?"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pretty_name" default="#dotlrn.user_portal_pretty_name#" description="the pretty name for the user portal"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_portal_pretty_name" default="#dotlrn.class_instance_portal_pretty_name#" description="the nice name for the class instance portal template"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pages_csv" default="#dotlrn.user_portal_page_home_title#,Simple 2-Column;#dotlrn.user_portal_page_calendar_title#,Simple 1-Column;#dotlrn.user_portal_page_file_storage_title#,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pages_csv" default="#dotlrn.user_portal_page_home_title#,#new-portal.simple_2column_layout_name#;#dotlrn.user_portal_page_calendar_title#,#new-portal.simple_1column_layout_name#;#dotlrn.user_portal_page_file_storage_title#,#new-portal.simple_1column_layout_name#" description="a csv list of the other pages to create on the user wsp by default"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="default_user_portal_applets" default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news" description="a csv list of the applets to call when creating the user portal template"/>
</parameters>
-
</version>
</package>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 10 Nov 2002 17:57:12 -0000 1.3
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 12 Nov 2002 08:44:04 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 07 15:44 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 November 11 21:06 -->
<message_catalog package_key="dotlrn" locale="en_US" charset="ISO-8859-1">
<msg key="A_copy_of">A copy of</msg>
@@ -94,11 +94,16 @@
<msg key="Guest_1">Guest?</msg>
<msg key="Header_Font">Header Font</msg>
<msg key="Header_Font_Color">Header Font Color</msg>
+ <msg key="Header_Font_Colors">Header Font Colors</msg>
<msg key="Header_Font_Size">Header Font Size</msg>
+ <msg key="Header_Font_Sizes">Header Font Sizes</msg>
+ <msg key="Header_Fonts">Header Fonts</msg>
<msg key="Header_Icon">Header Icon</msg>
<msg key="Header_Icon_Alt_Text">Header Icon Alt Text</msg>
<msg key="Header_Icon_Alt_text">Header Icon Alt text</msg>
<msg key="Header_Logo">Header Logo</msg>
+ <msg key="Header_Logo_Alt_Text">Header Logo Alt Text</msg>
+ <msg key="Header_Logo_Item_ID">Header Logo Item ID</msg>
<msg key="Help">Help</msg>
<msg key="ID">ID:</msg>
<msg key="ID_1">ID</msg>
@@ -117,6 +122,7 @@
<msg key="Limited">Limited</msg>
<msg key="Limited_Access">Limited Access</msg>
<msg key="Mail_Failed">Mail Failed</msg>
+ <msg key="Manage">Manage</msg>
<msg key="Manage_Applets">Manage Applets</msg>
<msg key="Manage_Members">Manage Members</msg>
<msg key="Manage_Membership">Manage Membership</msg>
@@ -219,6 +225,8 @@
<msg key="add_selected_members">Add Selected Members</msg>
<msg key="admin">admin</msg>
<msg key="admin_page_name">Control Panel</msg>
+ <msg key="admin_role_pretty_name">Administrator</msg>
+ <msg key="admin_role_pretty_plural">Administrators</msg>
<msg key="and">and</msg>
<msg key="approve">approve</msg>
<msg key="aqua">aqua</msg>
@@ -253,6 +261,10 @@
<msg key="community_since">community since</msg>
<msg key="control_panel">Control Panel</msg>
<msg key="couldnt_find_user_id">We couldn't find user #%user_id%; perhaps this person was deleted?</msg>
+ <msg key="course_admin_role_pretty_name">Course Administrator</msg>
+ <msg key="course_admin_role_pretty_plural">Course Administrators</msg>
+ <msg key="course_assistant_role_pretty_name">Course Assistant</msg>
+ <msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
<msg key="days_ago">days ago</msg>
<msg key="department_must_be_empty_to_be_deleted">Error: %departments_pretty_name% must be empty to be deleted</msg>
<msg key="department_name_already_in_use">The name <strong>%department_pretty_name%</strong> is already in use. \n Please select a different name.</msg>
@@ -263,7 +275,20 @@
<msg key="dotLRN_Admin">dotLRN Admin</msg>
<msg key="dotLRN_Information">dotLRN Information</msg>
<msg key="dotlrn_admin_pretty_name">Site Wide Administration</msg>
+ <msg key="dotlrn_admin_rel_pretty_name">dotLRN Admin Community Membership</msg>
+ <msg key="dotlrn_admin_rel_pretty_plural">dotLRN Admin Community Memberships</msg>
+ <msg key="dotlrn_class_instance_description">e.g. 6.001</msg>
+ <msg key="dotlrn_class_instance_pretty_name">Class</msg>
+ <msg key="dotlrn_class_instance_pretty_plural">Classes</msg>
+ <msg key="dotlrn_club_description">e.g. Alumni</msg>
+ <msg key="dotlrn_club_pretty_name">Club</msg>
+ <msg key="dotlrn_club_pretty_plural">Clubs</msg>
+ <msg key="dotlrn_community_description">Communities - the base community type</msg>
+ <msg key="dotlrn_community_pretty_name">Community</msg>
+ <msg key="dotlrn_community_pretty_plural">Communities</msg>
<msg key="dotlrn_main_portlet_pretty_name">Groups</msg>
+ <msg key="dotlrn_member_rel_pretty_name">dotLRN Community Membership</msg>
+ <msg key="dotlrn_member_rel_pretty_plural">dotLRN Community Memberships</msg>
<msg key="edit_approved_email_servers">Edit Pre-approved Email Servers</msg>
<msg key="edit_message_and_hit_send">Edit the message below and hit "Send Email" to
notify this user.</msg>
@@ -279,6 +304,8 @@
<msg key="has_been_added_to">has been added to</msg>
<msg key="header_logo">Header Logo</msg>
<msg key="help">Help</msg>
+ <msg key="instructor_role_pretty_name">Professor</msg>
+ <msg key="instructor_role_pretty_plural">Professors</msg>
<msg key="is_already_in_use">is already in use</msg>
<msg key="item">item</msg>
<msg key="items">items</msg>
@@ -402,12 +429,16 @@
<msg key="seconds">seconds.</msg>
<msg key="send_email">Send Email</msg>
<msg key="silver">silver</msg>
+ <msg key="student_role_pretty_name">Student</msg>
+ <msg key="student_role_pretty_plural">Students</msg>
<msg key="subcomm_page_calendar_title">Calendar</msg>
<msg key="subcomm_page_file_storage_title">Files</msg>
<msg key="subcomm_page_home_title">Subgroup Home</msg>
<msg key="subcomm_page_info_title">Subgroup Info</msg>
<msg key="subcommunities_pretty_name">Subgroup</msg>
<msg key="subcommunities_pretty_plural">Subgroups</msg>
+ <msg key="teaching_assistant_role_pretty_name">Teaching Assistant</msg>
+ <msg key="teaching_assistant_role_pretty_plural">Teaching Assistants</msg>
<msg key="teal">teal</msg>
<msg key="term">Term</msg>
<msg key="term_properties">term properties.</msg>
@@ -431,6 +462,8 @@
<msg key="user_portal_page_file_storage_title">My Files</msg>
<msg key="user_portal_page_home_title">MySpace</msg>
<msg key="user_portal_pretty_name">User</msg>
+ <msg key="user_type_external_pretty_name">External</msg>
+ <msg key="user_type_staff_pretty_name">Staff</msg>
<msg key="users">Users</msg>
<msg key="visit">Visit</msg>
<msg key="yes">yes</msg>
Index: openacs-4/packages/dotlrn/sql/oracle/admins-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/admins-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/admins-init.sql 9 Aug 2002 18:39:24 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/oracle/admins-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -66,7 +66,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- ('admin', 'Staff', 'dotlrn_admin_profile_rel', group_id, segment_id);
+ ('admin', '#dotlrn.user_type_staff_pretty_name#', 'dotlrn_admin_profile_rel', group_id, segment_id);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql 9 Aug 2002 18:39:24 -0000 1.29
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql 12 Nov 2002 08:44:05 -0000 1.30
@@ -33,18 +33,18 @@
foo := dotlrn_community_type.new(
community_type => 'dotlrn_community',
parent_type => null,
- pretty_name => 'Community',
- pretty_plural => 'Communities',
- description => 'Communities - the base community type'
+ pretty_name => '#dotlrn.dotlrn_community_pretty_name#',
+ pretty_plural => '#dotlrn.dotlrn_community_pretty_plural#',
+ description => '#dotlrn.dotlrn_community_description#'
);
-- these are the possible attributes of a community
bar := acs_attribute.create_attribute(
object_type => 'dotlrn_community',
attribute_name => 'header_font',
datatype => 'string',
- pretty_name => 'Header Font',
- pretty_plural => 'Header Fonts',
+ pretty_name => '#dotlrn.Header_Font#',
+ pretty_plural => '#dotlrn.Header_Fonts#',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -54,8 +54,8 @@
object_type => 'dotlrn_community',
attribute_name => 'header_font_size',
datatype => 'string',
- pretty_name => 'Header Font Size',
- pretty_plural => 'Header Font Sizes',
+ pretty_name => '#dotlrn.Header_Font_Size#',
+ pretty_plural => '#dotlrn.Header_Font_Sizes#',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -65,8 +65,8 @@
object_type => 'dotlrn_community',
attribute_name => 'header_font_color',
datatype => 'string',
- pretty_name => 'Header Font Color',
- pretty_plural => 'Header Font Colors',
+ pretty_name => '#dotlrn.Header_Font_Color#',
+ pretty_plural => '#dotlrn.Header_Font_Colors#',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -76,8 +76,8 @@
object_type => 'dotlrn_community',
attribute_name => 'header_logo_item_id',
datatype => 'integer',
- pretty_name => 'Header Logo Item ID',
- pretty_plural => 'Header Logo Item ID',
+ pretty_name => '#dotlrn.Header_Logo_Item_ID#',
+ pretty_plural => '#dotlrn.Header_Logo_Item_ID#',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -87,8 +87,8 @@
object_type => 'dotlrn_community',
attribute_name => 'header_logo_alt_text',
datatype => 'integer',
- pretty_name => 'Header Logo Alt Text',
- pretty_plural => 'Header Logo Alt Text',
+ pretty_name => '#dotlrn.Header_Logo_Alt_Text#',
+ pretty_plural => '#dotlrn.Header_Logo_Alt_Text#',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -98,18 +98,18 @@
foo := dotlrn_community_type.new(
community_type => 'dotlrn_class_instance',
parent_type => 'dotlrn_community',
- pretty_name => 'Class',
- pretty_plural => 'Classes',
- description => 'e.g. 6.001'
+ pretty_name => '#dotlrn.dotlrn_class_instance_pretty_name#',
+ pretty_plural => '#dotlrn.dotlrn_class_instance_pretty_plural#',
+ description => '#dotlrn.dotlrn_class_instance_description#'
);
-- create the dotlrn_club community type
foo := dotlrn_community_type.new(
community_type => 'dotlrn_club',
parent_type => 'dotlrn_community',
- pretty_name => 'Club',
- pretty_plural => 'Clubs',
- description => 'e.g. Alumni'
+ pretty_name => '#dotlrn.dotlrn_club_pretty_name#',
+ pretty_plural => '#dotlrn.dotlrn_club_pretty_plural#',
+ description => '#dotlrn.dotlrn_club_description#'
);
update acs_object_types set table_name = 'dotlrn_community', package_name = 'dotlrn_community' where object_type = 'dotlrn_community';
@@ -141,8 +141,8 @@
-- create roles
acs_rel_type.create_role(
role => 'student',
- pretty_name => 'Student',
- pretty_plural => 'Students'
+ pretty_name => '#dotlrn.student_role_pretty_name#',
+ pretty_plural => '#dotlrn.student_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -169,8 +169,8 @@
acs_rel_type.create_role(
role => 'course_assistant',
- pretty_name => 'Course Assistant',
- pretty_plural => 'Course Assistants'
+ pretty_name => '#dotlrn.course_assistant_role_pretty_name#',
+ pretty_plural => '#dotlrn.course_assistant_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -197,8 +197,8 @@
acs_rel_type.create_role(
role => 'teaching_assistant',
- pretty_name => 'Teaching Assistant',
- pretty_plural => 'Teaching Assistants'
+ pretty_name => '#dotlrn.teaching_assistant_role_pretty_name#',
+ pretty_plural => '#dotlrn.teaching_assistant_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -225,8 +225,8 @@
acs_rel_type.create_role(
role => 'instructor',
- pretty_name => 'Professor',
- pretty_plural => 'Professors'
+ pretty_name => '#dotlrn.instructor_role_pretty_name#',
+ pretty_plural => '#dotlrn.instructor_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -253,8 +253,8 @@
acs_rel_type.create_role(
role => 'course_admin',
- pretty_name => 'Course Administrator',
- pretty_plural => 'Course Administrators'
+ pretty_name => '#dotlrn.course_admin_role_pretty_name#',
+ pretty_plural => '#dotlrn.course_admin_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -281,8 +281,8 @@
acs_rel_type.create_role(
role => 'admin',
- pretty_name => 'Administrator',
- pretty_plural => 'Administrators'
+ pretty_name => '#dotlrn.admin_role_pretty_name#',
+ pretty_plural => '#dotlrn.admin_role_pretty_plural#'
);
bar := acs_attribute.create_attribute(
@@ -301,7 +301,7 @@
attribute_name => 'admin_pretty_plural',
datatype => 'string',
pretty_name => 'Administrator Pretty Plural',
- pretty_plural => 'RAdministrator Pretty Plural',
+ pretty_plural => 'Administrator Pretty Plural',
min_n_values => 0,
max_n_values => 1,
storage => 'generic'
@@ -311,8 +311,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_member_rel',
supertype => 'membership_rel',
- pretty_name => 'dotLRN Community Membership',
- pretty_plural => 'dotLRN Community Memberships',
+ pretty_name => '#dotlrn.dotlrn_member_rel_pretty_name#',
+ pretty_plural => '#dotlrn.dotlrn_member_rel_pretty_plural#',
package_name => 'dotlrn_member_rel',
table_name => 'dotlrn_member_rels',
id_column => 'rel_id',
@@ -325,8 +325,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_admin_rel',
supertype => 'dotlrn_member_rel',
- pretty_name => 'dotLRN Admin Community Membership',
- pretty_plural => 'dotLRN Admin Community Memberships',
+ pretty_name => '#dotlrn.dotlrn_admin_rel_pretty_name#',
+ pretty_plural => '#dotlrn.dotlrn_admin_rel_pretty_plural#',
package_name => 'dotlrn_admin_rel',
table_name => 'dotlrn_admin_rels',
id_column => 'rel_id',
Index: openacs-4/packages/dotlrn/sql/oracle/externals-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/externals-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/externals-init.sql 9 Aug 2002 18:39:24 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/oracle/externals-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -66,7 +66,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- ('external', 'External', 'dotlrn_external_profile_rel', group_id, segment_id);
+ ('external', '#dotlrn.user_type_external_pretty_name#', 'dotlrn_external_profile_rel', group_id, segment_id);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/oracle/professors-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/professors-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/professors-init.sql 9 Aug 2002 18:39:24 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/oracle/professors-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -66,7 +66,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- ('professor', 'Professor', 'dotlrn_professor_profile_rel', group_id, segment_id);
+ ('professor', '#dotlrn.instructor_role_pretty_name#', 'dotlrn_professor_profile_rel', group_id, segment_id);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/oracle/students-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/students-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/students-init.sql 9 Aug 2002 18:39:24 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/oracle/students-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -66,7 +66,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- ('student', 'Student', 'dotlrn_student_profile_rel', group_id, segment_id);
+ ('student', '#dotlrn.student_role_pretty_name#', 'dotlrn_student_profile_rel', group_id, segment_id);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql 9 Aug 2002 18:39:25 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -69,7 +69,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- (''admin'', ''Staff'', ''dotlrn_admin_profile_rel'', gid, sid);
+ (''admin'', ''#dotlrn.user_type_staff_pretty_name#'', ''dotlrn_admin_profile_rel'', gid, sid);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql 9 Aug 2002 18:39:25 -0000 1.10
+++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql 12 Nov 2002 08:44:05 -0000 1.11
@@ -34,18 +34,18 @@
perform dotlrn_community_type__new(
''dotlrn_community'',
null,
- ''Community'',
- ''Communities'',
- ''Communities - the base community type''
+ ''#dotlrn.dotlrn_community_pretty_name#'',
+ ''#dotlrn.dotlrn_community_pretty_plural#'',
+ ''#dotlrn.dotlrn_community_description#''
);
-- these are the possible attributes of a community
perform acs_attribute__create_attribute(
''dotlrn_community'',
''header_font'',
''string'',
- ''Header Font'',
- ''Header Fonts'',
+ ''#dotlrn.Header_Font#'',
+ ''#dotlrn.Header_Fonts#'',
null, null, null,
0,
1,
@@ -58,8 +58,8 @@
''dotlrn_community'',
''header_font_size'',
''string'',
- ''Header Fon Sizet'',
- ''Header Fonts Sizes'',
+ ''#dotlrn.Header_Font_Size#'',
+ ''#dotlrn.Header_Font_Sizes#'',
null, null, null,
0,
1,
@@ -72,8 +72,8 @@
''dotlrn_community'',
''header_font_color'',
''string'',
- ''Header Font Color'',
- ''Header Fonts Colors'',
+ ''#dotlrn.Header_Font_Color#'',
+ ''#dotlrn.Header_Font_Colors#'',
null, null, null,
0,
1,
@@ -86,8 +86,8 @@
''dotlrn_community'',
''header_logo_item_id'',
''integer'',
- ''Header Logo Item ID'',
- ''Header Logo Item ID'',
+ ''#dotlrn.Header_Logo_Item_ID#'',
+ ''#dotlrn.Header_Logo_Item_ID#'',
null, null, null,
0,
1,
@@ -100,8 +100,8 @@
''dotlrn_community'',
''header_logo_alt_text'',
''integer'',
- ''Header Logo Alt Text'',
- ''Header Logo Alt Text'',
+ ''#dotlrn.Header_Logo_Alt_Text#'',
+ ''#dotlrn.Header_Logo_Alt_Text#'',
null, null, null,
0,
1,
@@ -115,18 +115,18 @@
perform dotlrn_community_type__new(
''dotlrn_class_instance'',
''dotlrn_community'',
- ''Class'',
- ''Classes'',
- ''e.g. 6.001''
+ ''#dotlrn.dotlrn_class_instance_pretty_name#'',
+ ''#dotlrn.dotlrn_class_instance_pretty_plural#'',
+ ''#dotlrn.dotlrn_class_instance_description#''
);
-- create the dotlrn_club community type
perform dotlrn_community_type__new(
''dotlrn_club'',
''dotlrn_community'',
- ''Club'',
- ''Clubs'',
- ''e.g. Alumni''
+ ''#dotlrn.dotlrn_club_pretty_name#'',
+ ''#dotlrn.dotlrn_club_pretty_plural#'',
+ ''#dotlrn.dotlrn_club_description#''
);
update acs_object_types set table_name = ''dotlrn_community'', package_name = ''dotlrn_community'' where object_type = ''dotlrn_community'';
@@ -162,12 +162,12 @@
);
-- create roles
- perform acs_rel_type__create_role(''student'', ''Student'', ''Students'');
- perform acs_rel_type__create_role(''course_assistant'', ''Course Assistant'', ''Course Assistants'');
- perform acs_rel_type__create_role(''teaching_assistant'', ''Teaching Assistant'', ''Teaching Assistants'');
- perform acs_rel_type__create_role(''instructor'', ''Professor'', ''Professors'');
- perform acs_rel_type__create_role(''course_admin'', ''Course Administrator'', ''Course Administrators'');
- perform acs_rel_type__create_role(''admin'', ''Administrator'', ''Administrators'');
+ perform acs_rel_type__create_role(''student'', ''#dotlrn.student_role_pretty_name#'', ''#dotlrn.student_role_pretty_plural#'');
+ perform acs_rel_type__create_role(''course_assistant'', ''#dotlrn.course_assistant_role_pretty_name#'', ''#dotlrn.course_assistant_role_pretty_plural#'');
+ perform acs_rel_type__create_role(''teaching_assistant'', ''#dotlrn.teaching_assistant_role_pretty_name#'', ''#dotlrn.teaching_assistant_role_pretty_plural#'');
+ perform acs_rel_type__create_role(''instructor'', ''#dotlrn.instructor_role_pretty_name#'', ''#dotlrn.instructor_role_pretty_plural#'');
+ perform acs_rel_type__create_role(''course_admin'', ''#dotlrn.course_admin_role_pretty_name#'', ''#dotlrn.course_admin_role_pretty_plural#'');
+ perform acs_rel_type__create_role(''admin'', ''#dotlrn.admin_role_pretty_name#'', ''#dotlrn.admin_role_pretty_plural#'');
perform acs_attribute__create_attribute (
''dotlrn_community'',
@@ -341,8 +341,8 @@
perform acs_rel_type__create_type (
''dotlrn_member_rel'',
- ''dotLRN Community Membership'',
- ''dotLRN Community Memberships'',
+ ''#dotlrn.dotlrn_member_rel_pretty_name#'',
+ ''#dotlrn.dotlrn_member_rel_pretty_plural#'',
''membership_rel'',
''dotlrn_member_rels'',
''rel_id'',
@@ -359,8 +359,8 @@
perform acs_rel_type__create_type (
''dotlrn_admin_rel'',
- ''dotLRN Admin Community Membership'',
- ''dotLRN Admin Community Memberships'',
+ ''#dotlrn.dotlrn_admin_rel_pretty_name#'',
+ ''#dotlrn.dotlrn_admin_rel_pretty_plural#'',
''dotlrn_member_rel'',
''dotlrn_admin_rels'',
''rel_id'',
Index: openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql 9 Aug 2002 18:39:25 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -69,7 +69,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- (''external'', ''Externals'', ''dotlrn_external_profile_rel'', gid, sid);
+ (''external'', ''#dotlrn.user_type_external_pretty_name#'', ''dotlrn_external_profile_rel'', gid, sid);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql 9 Aug 2002 18:39:25 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -69,7 +69,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- (''professor'', ''Professor'', ''dotlrn_professor_profile_rel'', gid, sid);
+ (''professor'', ''#dotlrn.instructor_role_pretty_name#'', ''dotlrn_professor_profile_rel'', gid, sid);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/sql/postgresql/students-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/students-init.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/students-init.sql 9 Aug 2002 18:39:25 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/students-init.sql 12 Nov 2002 08:44:05 -0000 1.4
@@ -69,7 +69,7 @@
into dotlrn_user_types
(type, pretty_name, rel_type, group_id, segment_id)
values
- (''student'', ''Student'', ''dotlrn_student_profile_rel'', gid, sid);
+ (''student'', ''#dotlrn.student_role_pretty_name#'', ''dotlrn_student_profile_rel'', gid, sid);
select group_id
into dotlrn_users_group_id
Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl 23 Oct 2002 12:38:38 -0000 1.44
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 12 Nov 2002 08:44:05 -0000 1.45
@@ -153,7 +153,7 @@
if {![count_class_instances -class_key $class_key] == 0} {
set msg_subst_list [list subject [parameter::get -localize -parameter classes_pretty_name] \
class_instances [parameter::get -localize -parameter class_instances_pretty_plural]]
- ad_return_complaint 1 [_ [ad_conn locale] dotlrn.class_may_not_be_deleted "" $msg_subst_list]
+ ad_return_complaint 1 [_ dotlrn.class_may_not_be_deleted $msg_subst_list]
ad_script_abort
}
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.170 -r1.171
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 23 Oct 2002 12:38:38 -0000 1.170
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 12 Nov 2002 08:44:05 -0000 1.171
@@ -441,7 +441,8 @@
set pretty_name [lindex $roles [expr $i + 2]]
}
- return $pretty_name
+ ns_log Notice "PM: pretty_name $pretty_name [lang::util::localize $pretty_name]"
+ return [lang::util::localize $pretty_name]
}
ad_proc -public get_role_pretty_plural {
@@ -462,7 +463,7 @@
set pretty_plural [lindex $roles [expr $i + 3]]
}
- return $pretty_plural
+ return [lang::util::localize $pretty_plural]
}
ad_proc -public get_all_roles {} {
@@ -1060,7 +1061,7 @@
if {$complain_if_invalid_p && !$valid_p} {
ns_log notice "The name <strong>$community_key</strong> is already in use either by an active or archived group. \n Please go back and select a different name."
ad_return_complaint 1 \
- [_ [ad_conn locale] dotlrn.community_name_already_in_use "" [list community_key $community_key]]
+ [_ dotlrn.community_name_already_in_use [list community_key $community_key]]
ad_script_abort
} else {
Index: openacs-4/packages/dotlrn/tcl/department-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/department-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/tcl/department-procs.tcl 23 Oct 2002 12:38:38 -0000 1.9
+++ openacs-4/packages/dotlrn/tcl/department-procs.tcl 12 Nov 2002 08:44:05 -0000 1.10
@@ -39,7 +39,7 @@
-department_key $department_key]} {
ad_return_complaint \
1 \
- [_ [ad_conn locale] dotlrn.department_name_already_in_use "" [list department_pretty_name $pretty_name]]
+ [_ dotlrn.department_name_already_in_use [list department_pretty_name $pretty_name]]
ad_script_abort
}
@@ -90,7 +90,7 @@
# check that it's empty
if {![count_classes -department_key $department_key] == 0} {
set msg_subst_list [list departments_pretty_name [parameter::get -localize -parameter departments_pretty_name]]
- ad_return_complaint 1 [_ [ad_conn locale] dotlrn.department_must_be_empty_to_be_deleted "" $msg_subst_list]
+ ad_return_complaint 1 [_ dotlrn.department_must_be_empty_to_be_deleted $msg_subst_list]
ad_script_abort
}
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v
diff -u -r1.50 -r1.51
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 23 Oct 2002 12:38:38 -0000 1.50
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 12 Nov 2002 08:44:05 -0000 1.51
@@ -71,7 +71,14 @@
ad_proc -public get_user_types_as_options {} {
return the list of possible user types
} {
- return [db_list_of_lists select_user_types_as_options {}]
+ set unlocalized_list [db_list_of_lists select_user_types_as_options {}]
+
+ set localized_list [list]
+ foreach type_pair $unlocalized_list {
+ lappend localized_list [list [lang::util::localize [lindex $type_pair 0]] [lindex $type_pair 1]]
+ }
+
+ return $localized_list
}
ad_proc -public user_p {
Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/community-edit-2.tcl 23 Oct 2002 12:38:39 -0000 1.8
+++ openacs-4/packages/dotlrn/www/community-edit-2.tcl 12 Nov 2002 08:44:05 -0000 1.9
@@ -63,7 +63,7 @@
set msg_subst_list [list system_name [ad_system_name] \
max_attachments_bytes [util_commify_number [ad_parameter MaximumFileSize]]]
- ad_return_complaint 1 "<li>[_ [ad_conn locale] dotlrn.your_icon_is_too_large "" $msg_subst_list]"
+ ad_return_complaint 1 "<li>[_ dotlrn.your_icon_is_too_large $msg_subst_list]"
ad_script_abort
}
Index: openacs-4/packages/dotlrn/www/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/community-member.tcl 23 Oct 2002 12:38:39 -0000 1.10
+++ openacs-4/packages/dotlrn/www/community-member.tcl 12 Nov 2002 08:44:05 -0000 1.11
@@ -60,7 +60,7 @@
}
if {![db_0or1row user_information $user_info_sql]} {
- ad_return_error "[_ dotlrn.No_user_found]" [_ [ad_conn locale] dotlrn.no_community_member_with_id "" [list user_id $user_id]]
+ ad_return_error "[_ dotlrn.No_user_found]" [_ dotlrn.no_community_member_with_id [list user_id $user_id]]
ad_script_abort
}
Index: openacs-4/packages/dotlrn/www/deregister-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-link.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/deregister-link.adp 23 Oct 2002 12:38:39 -0000 1.7
+++ openacs-4/packages/dotlrn/www/deregister-link.adp 12 Nov 2002 08:44:05 -0000 1.8
@@ -19,6 +19,3 @@
%>
<a href="<if @url@ nil>#dotlrn.deregister#<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil>#dotlrn.Drop_Membership#</if><else>@label@</else></a>
-
-
-
Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/members-chunk-table.adp 23 Oct 2002 12:38:39 -0000 1.8
+++ openacs-4/packages/dotlrn/www/members-chunk-table.adp 12 Nov 2002 08:44:05 -0000 1.9
@@ -129,6 +129,3 @@
</formtemplate>
</if>
-
-
-
Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/members-chunk-table.tcl 23 Oct 2002 12:38:39 -0000 1.17
+++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl 12 Nov 2002 08:44:05 -0000 1.18
@@ -63,62 +63,62 @@
set table_def [list]
-lappend table_def {
- first_names
- "[_ dotlrn.First_Names]"
- {upper(first_names) $order}
- {<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]}
-}
+lappend table_def [list \
+ first_names \
+ [_ dotlrn.First_Names] \
+ {upper(first_names) $order} \
+ {<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]} \
+]
-lappend table_def {
- last_name
- "[_ dotlrn.Last_Name]"
- {upper(last_name) $order}
- {<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]}
-}
+lappend table_def [list \
+ last_name \
+ [_ dotlrn.Last_Name] \
+ {upper(last_name) $order} \
+ {<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]} \
+]
if {$read_private_data_p || [string equal $my_user_id \$user_id]} {
- lappend table_def {
- email
- [_ dotlrn.Email_1]
- {upper(email) $order, upper(role)}
- {<td><a href="mailto:$email">$email</a></td>}
- }
+ lappend table_def [list \
+ email \
+ [_ dotlrn.Email_1] \
+ {upper(email) $order, upper(role)} \
+ {<td><a href="mailto:$email">$email</a></td>} \
+ ]
} else {
- lappend table_def {
- email
- [_ dotlrn.Email_1]
- {upper(email) $order, upper(role)}
- {<td> </td>}
- }
+ lappend table_def [list \
+ email \
+ [_ dotlrn.Email_1] \
+ {upper(email) $order, upper(role)} \
+ {<td> </td>} \
+ ]
}
-lappend table_def {
- role
- [_ dotlrn.Role]
- {decode(role,'instructor',1,'admin',2,'teaching_assistant',3,'course_assistant',4,'course_admin',5,'student',6,'member',7) asc, last_name $order}
- {<td><nobr>[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]</nobr></td>}
-}
+lappend table_def [list \
+ role \
+ [_ dotlrn.Role] \
+ {decode(role,'instructor',1,'admin',2,'teaching_assistant',3,'course_assistant',4,'course_admin',5,'student',6,'member',7) asc, last_name $order} \
+ {<td><nobr>[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]</nobr></td>} \
+]
if {$site_wide_admin_p} {
- lappend table_def {
- manage
- [_ dotlrn.Actions]
- {}
- {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop Membership</a> | <a href="[dotlrn::get_url]/admin/user?user_id=$user_id">Manage</a> </small>\]</td>}
- }
+ lappend table_def [list \
+ manage \
+ [_ dotlrn.Actions] \
+ {} \
+ {<td>\[<small> <a href=\"deregister?user_id=$user_id&referer=$referer\">[_ dotlrn.Drop_Membership]</a> | <a href=\"[dotlrn::get_url]/admin/user?user_id=$user_id\">[_ dotlrn.Manage]</a> </small>\]</td>} \
+ ]
} elseif {$admin_p} {
- lappend table_def {
- manage
- [_ dotlrn.Actions]
- {}
- {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop Membership</a> <small>\]}
- }
+ lappend table_def [list \
+ manage \
+ [_ dotlrn.Actions] \
+ {} \
+ {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop Membership</a> <small>\]} \
+ ]
} else {
- lappend table_def {
- manage
- [_ dotlrn.Actions]
- {}
+ lappend table_def [list \
+ manage \
+ [_ dotlrn.Actions] \
+ {} \
{
[eval {
if {$my_user_id == $user_id} {
@@ -127,8 +127,8 @@
return "<td> </td>"
}
}]
- }
- }
+ } \
+ ]
}
set table [ad_table \
Index: openacs-4/packages/dotlrn/www/members-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/members-chunk.adp 23 Oct 2002 12:38:39 -0000 1.18
+++ openacs-4/packages/dotlrn/www/members-chunk.adp 12 Nov 2002 08:44:05 -0000 1.19
@@ -32,7 +32,7 @@
<if @admin_p@ eq 1 or @user_id@ eq @users.user_id@>
[<small>
- <include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="Drop Membership">
+ <include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="#dotlrn.Drop_Membership#">
</small>]
</if>
</li>
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/members.adp 23 Oct 2002 12:38:39 -0000 1.16
+++ openacs-4/packages/dotlrn/www/members.adp 12 Nov 2002 08:44:05 -0000 1.17
@@ -22,6 +22,3 @@
<property name="title">#dotlrn.Manage_Membership#</property>
<include src="members-chunk-table" referer="members">
-
-
-
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn/www/one-community-admin.adp 23 Oct 2002 12:38:39 -0000 1.24
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp 12 Nov 2002 08:44:05 -0000 1.25
@@ -23,7 +23,4 @@
<property name="title">@pretty_name@ #dotlrn.Admin#</property>
<property name="link_control_panel">0</property>
-
@rendered_page@
-
-
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl 23 Oct 2002 12:38:39 -0000 1.24
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl 12 Nov 2002 08:44:05 -0000 1.25
@@ -47,4 +47,3 @@
set context_bar [_ dotlrn.Admin]
ad_return_template
-
Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 23 Oct 2002 12:38:39 -0000 1.7
+++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 12 Nov 2002 08:44:05 -0000 1.8
@@ -34,7 +34,7 @@
set user_id [ad_get_user_id]
dotlrn::require_user_admin_community -community_id $community_id
set pretty_name [dotlrn_community::get_community_name $community_id]
-set title [_ [ad_conn locale] dotlrn.arhive_group_name "" [list group_name $pretty_name]]
+set title [_ dotlrn.arhive_group_name [list group_name $pretty_name]]
form create archive_form
Index: openacs-4/packages/dotlrn/www/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/user-add-3.tcl 23 Oct 2002 12:38:39 -0000 1.5
+++ openacs-4/packages/dotlrn/www/user-add-3.tcl 12 Nov 2002 08:44:05 -0000 1.6
@@ -34,7 +34,7 @@
}]
set msg_subst_values [list system_name [ad_system_name] system_url [ad_parameter SystemUrl]]
-set email_subject [_ [ad_conn locale] dotlrn.user_add_confirm_email_subject "" $msg_subst_values]
+set email_subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_values]
if [catch {ns_sendmail "$email" "$admin_email" "$email_subject" "$message"} errmsg] {
ad_return_error "[_ dotlrn.Mail_Failed]" "[_ dotlrn.lt_The_system_was_unable]
<blockquote><pre>
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/user.adp 23 Oct 2002 12:38:40 -0000 1.17
+++ openacs-4/packages/dotlrn/www/admin/user.adp 12 Nov 2002 08:44:06 -0000 1.18
@@ -83,7 +83,7 @@
<li>
#dotlrn.User_type#
- @pretty_type@
+ <%= [lang::util::localize @pretty_type@] %>
</li>
<li>
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/user.tcl 23 Oct 2002 12:38:40 -0000 1.11
+++ openacs-4/packages/dotlrn/www/admin/user.tcl 12 Nov 2002 08:44:06 -0000 1.12
@@ -45,7 +45,7 @@
set export_edit_vars "user_id=$user_id&return_url=$return_url"
if {![db_0or1row select_user_info {}]} {
- ad_return_complaint 1 "<li>[_ [ad_conn locale] dotlrn.couldnt_find_user_id "" [list user_id $user_id]]</li>"
+ ad_return_complaint 1 "<li>[_ dotlrn.couldnt_find_user_id [list user_id $user_id]]</li>"
ad_script_abort
}
if {[empty_string_p $screen_name]} {
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 23 Oct 2002 12:38:40 -0000 1.8
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 12 Nov 2002 08:44:06 -0000 1.9
@@ -51,7 +51,7 @@
# Check if this user already exists
set user_id [cc_lookup_email_user $row(email)]
if {![empty_string_p $user_id]} {
- doc_body_append [_ [ad_conn locale] dotlrn.user_email_already_exists "" [list user_email $row(email)]]
+ doc_body_append [_ dotlrn.user_email_already_exists [list user_email $row(email)]]
lappend list_of_user_ids $user_id
} else {
set user_id [ad_user_new $row(email) $row(first_names) $row(last_name) $password "" "" "" "t" "approved"]
@@ -90,13 +90,13 @@
# Set the privacy
acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $inverse_row_guest
- doc_body_append [_ [ad_conn locale] dotlrn.user_email_created "" [list user_email $row(email)]]
+ doc_body_append [_ dotlrn.user_email_created [list user_email $row(email)]]
set msg_subst_list [list system_name [ad_system_name] \
system_url [ad_parameter SystemUrl] \
user_email $row(email) \
user_password $password]
- set message [_ [ad_conn locale] dotlrn.user_add_confirm_email_body "" $msg_subst_list]
- set subject [_ [ad_conn locale] dotlrn.user_add_confirm_email_subject "" $msg_subst_list]
+ set message [_ dotlrn.user_add_confirm_email_body $msg_subst_list]
+ set subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_list]
# Send note to new user
if [catch {ns_sendmail "$row(email)" "$admin_email" "$subject" "$message"} errmsg] {
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp 23 Oct 2002 12:38:40 -0000 1.7
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp 12 Nov 2002 08:44:06 -0000 1.8
@@ -19,5 +19,3 @@
%>
<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
-
-
Index: openacs-4/packages/dotlrn/www/admin/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/users.tcl 23 Oct 2002 12:38:40 -0000 1.16
+++ openacs-4/packages/dotlrn/www/admin/users.tcl 12 Nov 2002 08:44:06 -0000 1.17
@@ -40,13 +40,20 @@
order by dotlrn_user_types.pretty_name
}]
+# The roles are stored as message keys in the database so we need to localize them
+# on the fly here
+set dotlrn_roles_localized [list]
+foreach role_pair $dotlrn_roles {
+ lappend dotlrn_roles_localized [list [lindex $role_pair 0] [lang::util::localize [lindex $role_pair 1]]]
+}
+
set n_pending_users [db_string select_non_dotlrn_users_count {}]
lappend dotlrn_roles [list pending "[_ dotlrn.Pending] ($n_pending_users)" {}]
set n_deactivated_users [db_string select_deactivated_users_count {}]
lappend dotlrn_roles [list deactivated "[_ dotlrn.Deactivated] ($n_deactivated_users)" {}]
-set control_bar [ad_dimensional [list [list type {User Type:} admin $dotlrn_roles]]]
+set control_bar [ad_dimensional [list [list type "[_ dotlrn.User_Type]:" admin $dotlrn_roles_localized]]]
if {[string equal $type "deactivated"] == 1} {
set n_users $n_deactivated_users