[_ 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 -N -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 -N -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 @@
%>
#dotlrn.Drop_Membership#@label@
-
-
-
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 -N -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 @@
-
-
-
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 -N -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}
- {| [acs_community_member_link -user_id $user_id -label $first_names | ]}
-}
+lappend table_def [list \
+ first_names \
+ [_ dotlrn.First_Names] \
+ {upper(first_names) $order} \
+ {[acs_community_member_link -user_id $user_id -label $first_names | ]} \
+]
-lappend table_def {
- last_name
- "[_ dotlrn.Last_Name]"
- {upper(last_name) $order}
- {[acs_community_member_link -user_id $user_id -label $last_name | ]}
-}
+lappend table_def [list \
+ last_name \
+ [_ dotlrn.Last_Name] \
+ {upper(last_name) $order} \
+ {[acs_community_member_link -user_id $user_id -label $last_name | ]} \
+]
if {$read_private_data_p || [string equal $my_user_id \$user_id]} {
- lappend table_def {
- email
- [_ dotlrn.Email_1]
- {upper(email) $order, upper(role)}
- {$email | }
- }
+ lappend table_def [list \
+ email \
+ [_ dotlrn.Email_1] \
+ {upper(email) $order, upper(role)} \
+ {$email | } \
+ ]
} else {
- lappend table_def {
- email
- [_ dotlrn.Email_1]
- {upper(email) $order, upper(role)}
- { | }
- }
+ lappend table_def [list \
+ email \
+ [_ dotlrn.Email_1] \
+ {upper(email) $order, upper(role)} \
+ { | } \
+ ]
}
-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}
- {[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] | }
-}
+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} \
+ {[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] | } \
+]
if {$site_wide_admin_p} {
- lappend table_def {
- manage
- [_ dotlrn.Actions]
- {}
- {\[ Drop Membership | Manage \] | }
- }
+ lappend table_def [list \
+ manage \
+ [_ dotlrn.Actions] \
+ {} \
+ {\[ [_ dotlrn.Drop_Membership] | [_ dotlrn.Manage] \] | } \
+ ]
} elseif {$admin_p} {
- lappend table_def {
- manage
- [_ dotlrn.Actions]
- {}
- {\[ Drop Membership \]}
- }
+ lappend table_def [list \
+ manage \
+ [_ dotlrn.Actions] \
+ {} \
+ {\[ Drop Membership \]} \
+ ]
} 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 "| | "
}
}]
- }
- }
+ } \
+ ]
}
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 -N -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 @@
[
-
+
]
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -N -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 @@
#dotlrn.Manage_Membership#
-
-
-
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 -N -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 @@
@pretty_name@ #dotlrn.Admin#
0
-
@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 -N -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 -N -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 -N -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]
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 -N -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 @@
#dotlrn.User_type#
- @pretty_type@
+ <%= [lang::util::localize @pretty_type@] %>
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 -N -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 "[_ [ad_conn locale] dotlrn.couldnt_find_user_id "" [list user_id $user_id]]"
+ ad_return_complaint 1 "[_ dotlrn.couldnt_find_user_id [list user_id $user_id]]"
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 -N -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 -N -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 @@
%>
-
-
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 -N -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
| |