Index: openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:50:07 -0000	1.3
+++ openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml	11 Dec 2002 14:06:31 -0000	1.4
@@ -1,26 +1,17 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 December 03 13:18 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 05 22:16 -->
 <message_catalog package_key="dotlrn-portlet" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="admin_pretty_name">Group Administration</msg>
   <msg key="Administer">Administer</msg>
   <msg key="All_members">All members</msg>
   <msg key="Archive">Archive</msg>
   <msg key="Archive_this_group">Archive this group</msg>
   <msg key="Closed">Closed</msg>
   <msg key="Copy_this_group">Copy this group</msg>
   <msg key="Email_Members">Email Members</msg>
-  <msg key="Manage_Applets">Manage Applets</msg>
-  <msg key="Manage_Membership">Manage Membership</msg>
-  <msg key="Member_List">Member List</msg>
-  <msg key="Needs_Approval">Needs Approval</msg>
-  <msg key="New_sub_pretty_name">New %sub_pretty_name%</msg>
-  <msg key="No">No</msg>
-  <msg key="Only_admins">Only admins</msg>
-  <msg key="Open">Open</msg>
-  <msg key="Sort">Sort</msg>
-  <msg key="Sortmanage">Sort/manage</msg>
-  <msg key="admin_pretty_name">Group Administration</msg>
   <msg key="lt_AddRemove_pretty_name">Add/Remove %pretty_name% members</msg>
+  <msg key="lt_can_send_bulk_mail_to">can send bulk mail to this community.</msg>
   <msg key="lt_Change_Bulk_Mail_Poli">Change Bulk Mail Policy</msg>
   <msg key="lt_Change_Enrollment_Pol">Change Enrollment Policy</msg>
   <msg key="lt_Create_a_new_Limited_">Create a new Limited Access user</msg>
@@ -32,7 +23,18 @@
         Information about other members of this community will not be available to this user.</msg>
   <msg key="lt_Sorry_this_functional">Sorry, this functionality is not available to guests</msg>
   <msg key="lt_This_group_is_archive">This group is archived</msg>
-  <msg key="lt_can_send_bulk_mail_to">can send bulk mail to this community.</msg>
+  <msg key="Manage_Applets">Manage Applets</msg>
+  <msg key="Manage_Membership">Manage Membership</msg>
+  <msg key="Member_List">Member List</msg>
   <msg key="members_portlet_pretty_name">Members</msg>
   <msg key="members_staff_portlet_pretty_name">Staff List</msg>
+  <msg key="Needs_Approval">Needs Approval</msg>
+  <msg key="New_sub_pretty_name">New %sub_pretty_name%</msg>
+  <msg key="no_course_assistant_members">No %course_assistant_role_pretty_plural%</msg>
+  <msg key="no_instructor_members">No %instructor_role_pretty_plural%</msg>
+  <msg key="no_teaching_assistant_members">No %teaching_assistant_role_pretty_plural%</msg>
+  <msg key="Only_admins">Only admins</msg>
+  <msg key="Open">Open</msg>
+  <msg key="Sort">Sort</msg>
+  <msg key="Sortmanage">Sort/manage</msg>
 </message_catalog>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	4 Dec 2002 09:50:08 -0000	1.12
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	11 Dec 2002 14:06:31 -0000	1.13
@@ -21,44 +21,52 @@
 
 <if @config.shaded_p@ ne "t">
 <if @read_private_data_p@ eq 1>
+
 <table class="table-display" cellpadding=3 cellspacing=0>
-<tr class="table-header"><td align=right colspan=3>
-<a href="members"><if @admin_p@ ne 1>#dotlrn-portlet.Sort#</if><else>#dotlrn-portlet.Sortmanage#</else>
-</if>
-</a>
-</td></tr>
-<multiple name="users">
-<group column="role">
-<if @users.rownum@ odd>
-<tr class="odd">
-</if>
-<else>
-<tr class="even">
-</else>
+  <tr class="table-header">
+    <td align=right colspan=3>
+      <a href="members"><if @admin_p@ ne 1>#dotlrn-portlet.Sort#</if><else>#dotlrn-portlet.Sortmanage#</else></a>
+    </td>
+  </tr>
 
-<td>
+  <multiple name="users">
+  <group column="role">
+  <if @users.rownum@ odd>
+  <tr class="odd">
+  </if>
+  <else>
+  <tr class="even">
+  </else>
+
+    <td>
       <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
-</td><td>    
+    </td>
+    <td>    
       <a href="mailto:@users.email@">@users.email@</a>
-</td><td>
+    </td>
+    <td>
 	<i>@users.role@</i>
-</td></tr>
+    </td>
+  </tr>
   </group>
-
-
-</multiple>
+  </multiple>
 </table>
+
 <if @spam_p@ true>
+<p>
 <ul>
-<li>        <a href="spam?community_id=@community_id@&referer=@referer@">#dotlrn-portlet.Email_Members#</a>
+  <li><a href="spam?community_id=@community_id@&referer=@referer@">#dotlrn-portlet.Email_Members#</a></li>
 </ul>
+</p>
 </if>
 
 </if>
 <else>
+        <% # The user is not allowed to read the member list - he/she is maybe a guest %>
 	#dotlrn-portlet.lt_Sorry_this_functional#
 </else>
 </if>
 <else>
-<br>
+   <% # The portal is shaded - should not be displayed %>
+   <br>
 </else>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	4 Dec 2002 09:50:08 -0000	1.13
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	11 Dec 2002 14:06:31 -0000	1.14
@@ -34,7 +34,7 @@
     </multiple>
   </if>
   <else>
-    <li><small>#dotlrn-portlet.No# <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_instructor_rel] %></small>
+    <li><small>#dotlrn-portlet.no_instructor_members#</small>
   </else>
   </ul>
 
@@ -54,7 +54,7 @@
     </multiple>
   </if>
   <else>
-    <li><small>#dotlrn-portlet.No# <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ta_rel] %></small>
+    <li><small>#dotlrn-portlet.no_teaching_assistant_members#</small>
   </else>
   </ul>
 
@@ -74,7 +74,7 @@
     </multiple>
   </if>
   <else>
-    <li><small>#dotlrn-portlet.No# <%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_ca_rel] %></small>
+    <li><small>#dotlrn-portlet.no_course_assistant_members#</small>
   </else>
   </ul>
 
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl	9 Aug 2002 18:39:29 -0000	1.8
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl	11 Dec 2002 14:06:31 -0000	1.9
@@ -56,3 +56,11 @@
 template::util::list_of_ns_sets_to_multirow \
     -rows $all_users_list \
     -var_name "users"
+
+# Used in en_US version of some messages in adp
+set instructor_role_pretty_plural [dotlrn_community::get_role_pretty_plural -community_id $community_id \
+                                                                            -rel_type dotlrn_instructor_rel]
+set teaching_assistant_role_pretty_plural [dotlrn_community::get_role_pretty_plural -community_id $community_id \
+                                                                                     -rel_type dotlrn_ta_rel]
+set course_assistant_role_pretty_plural [dotlrn_community::get_role_pretty_plural -community_id $community_id \
+                                                                                  -rel_type dotlrn_ca_rel]
\ No newline at end of file