Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.118.2.3.4.6 -r1.118.2.3.4.7
--- openacs-4/packages/dotlrn/dotlrn.info	14 Sep 2004 15:34:25 -0000	1.118.2.3.4.6
+++ openacs-4/packages/dotlrn/dotlrn.info	11 Oct 2004 06:21:58 -0000	1.118.2.3.4.7
@@ -7,14 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.1.0b1" url="http://openacs.org/repository/download/apm/dotlrn-2.1.0b1.apm">
+    <version name="2.1.0b2" url="http://openacs.org/repository/download/apm/dotlrn-2.1.0b2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>A Course Management System</summary>
         <release-date>2004-03-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Course Management</description>
 
-        <provides url="dotlrn" version="2.1.0b1"/>
+        <provides url="dotlrn" version="2.1.0b2"/>
+        <requires url="acs-lang" version="5.1.2d1"/>
         <requires url="acs-kernel" version="5.0.0b4"/>
         <requires url="attachments" version="0.5"/>
         <requires url="new-portal" version="0.1a"/>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v
diff -u -r1.18.2.3.4.4 -r1.18.2.3.4.5
--- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	1 Oct 2004 14:31:17 -0000	1.18.2.3.4.4
+++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	11 Oct 2004 06:22:00 -0000	1.18.2.3.4.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="dotlrn" package_version="2.0.3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="dotlrn" package_version="2.1.0b1" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="A_copy_of">Eine Kopie von</msg>
   <msg key="Access">Zugriff</msg>
@@ -318,6 +318,7 @@
   <msg key="lt_Web_Log_for_user_name">Web-Tagebuch f�r %user_name%
 </msg>
   <msg key="lt_Well_we_tried_to_nuke">Beim L�schen des Benutzers ist ein Fehler aufgetreten. Die Ursache ist wahrscheinlich, dass innerhalb des Datenbankschemas eine Referenz auf den Benutzer (user_id=%user_id%) besteht. Wenden Sie sich an den Programmierer.</msg>
+  <msg key="lt_Year_eg_2003_20032004">Jahr (z.B. 2004, 2004/2005)</msg>
   <msg key="lt_You_are_about_to_dele">Sind sind im Begriff, %num_users% Benutzer zu l�schen.</msg>
   <msg key="lt_You_are_adding_strong">Sie f�gen &lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; zu &quot;%community_name%&quot; hinzu: </msg>
   <msg key="lt_You_are_not_allowed_t">Sie sind nicht berechtigt, diese Aktion auszuf�hren.</msg>
@@ -472,6 +473,7 @@
   <msg key="Templates">Vorlagen</msg>
   <msg key="Term">Semester</msg>
   <msg key="term">Semester</msg>
+  <msg key="Term_eg_Spring_Fall">Semester (z.B. SS, WS)</msg>
   <msg key="Term_ID">Semester-ID</msg>
   <msg key="term_properties">Eigenschaften des Semesters</msg>
   <msg key="Terms">Semester</msg>
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.33.2.6.4.11 -r1.33.2.6.4.12
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	8 Oct 2004 07:51:26 -0000	1.33.2.6.4.11
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	11 Oct 2004 06:22:00 -0000	1.33.2.6.4.12
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="dotlrn" package_version="2.0.3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="dotlrn" package_version="2.1.0b1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="A_copy_of">A copy of</msg>
   <msg key="Access">Access</msg>
@@ -45,12 +45,12 @@
 
   <msg key="Applets_to_Add">Applets To Add</msg>
   <msg key="Approve">Approve</msg>
-  <msg key="Approve_all">Approve all</msg>
   <msg key="approve">approve</msg>
+  <msg key="Approve_all">Approve all</msg>
   <msg key="aqua">aqua</msg>
+  <msg key="Archive">Archive</msg>
   <msg key="archived">Archived</msg>
   <msg key="archived_classes_and_communities">Archived %class_instances_pretty_plural% and %clubs_pretty_plural%</msg>
-  <msg key="Archive">Archive</msg>
   <msg key="archived_groups">Archived %groups_pretty_plural%</msg>
   <msg key="Are_you_sure">Are you sure?</msg>
   <msg key="are_you_sure_you_want_to_send">Are you sure you want to send the following</msg>
@@ -258,6 +258,7 @@
   <msg key="lt_An_error_occured_whil_1">An error occured while trying to remove a user to a community.  This error has been logged.</msg>
   <msg key="lt_approve_and_add_to_do">approve and add to dotLRN</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to archive group &lt;strong&gt;%pretty_name%&lt;/strong&gt; and all its subgroups (if any)?</msg>
+  <msg key="lt_Are_you_sure_you_want_nuke_users">Are you sure you want to remove these users completely?  Note that we only attempt to remove these users and may encounter errors for some of the users.</msg>
   <msg key="lt_Be_sure_that_the_pers">Be sure that the person does not already have an account under another email address. Duplicate accounts cause problems for everyone. To add a person with an existing account use &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
   <msg key="lt_Class_Key_a_short_nam">Class Key (a short name, no spaces)</msg>
   <msg key="lt_Communitys_Web_Addres">Community's Web Address</msg>
@@ -296,9 +297,9 @@
   <msg key="lt_JoinDrop_a_Class_or_C">Join/Drop a Class or Community Group</msg>
   <msg key="lt_JoinDrop_Classes_or_C">Join/Drop Classes or Communities</msg>
   <msg key="lt_Key_a_short_name_no_s">Key (a short name, no spaces)</msg>
+  <msg key="lt_Last_Visit_None_">User has not visited yet</msg>
   <msg key="lt_Last_Visit_Over_in_da">Last Visit Over (in days)</msg>
   <msg key="lt_Last_Visit_Within_in_">Last Visit Within (in days)</msg>
-  <msg key="lt_Last_Visit_None_">User has not visited yet</msg>
   <msg key="lt_Make_this_user_a_site">Make this user a site wide admin.</msg>
   <msg key="lt_Manage_this_users_por">Manage this user's portrait</msg>
   <msg key="lt_No_I_dont_want_to_arc">No, I don't want to archive this group.</msg>
@@ -315,7 +316,6 @@
 make an attempt.  If we succeed, you'll be redirected to where you
 were.  If there is an error and we are unable to complete the removal,
 we'll return an error message.</msg>
-  <msg key="lt_Are_you_sure_you_want_nuke_users">Are you sure you want to remove these users completely?  Note that we only attempt to remove these users and may encounter errors for some of the users.</msg>
   <msg key="lt_Please_follow_the_fol">Please follow the following link to reset your password:
 
 %change_password_url%
@@ -370,6 +370,7 @@
 likely case is that a reference to this user (user_id=%user_id%)
 exists somewhere in the database schema.  It's time to call your
 programmers! The actual error returned was:</msg>
+  <msg key="lt_Year_eg_2003_20032004">Year (e.g. 2003, 2003/2004)</msg>
   <msg key="lt_You_are_about_to_dele">You are about to delete %num_users% users.</msg>
   <msg key="lt_You_are_adding_strong">You are adding &lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; to %community_name%:</msg>
   <msg key="lt_You_are_not_allowed_t">You are not allowed to perform that action.</msg>
@@ -494,8 +495,8 @@
   <msg key="Registration_date">Registration date:</msg>
   <msg key="registration_request_sent">Thank you. Your registration request has been sent to the System Administrator</msg>
   <msg key="Reject">Reject</msg>
-  <msg key="Reject_all">Reject all</msg>
   <msg key="reject">reject</msg>
+  <msg key="Reject_all">Reject all</msg>
   <msg key="Request_Membership">Request Membership</msg>
   <msg key="request_membership_link">&lt;img src=/resources/dotlrn/request.gif alt=&quot;%label%&quot; border=&quot;0&quot; title=&quot;Request Membership&quot;&gt;</msg>
   <msg key="required">Required field</msg>
@@ -541,6 +542,7 @@
   <msg key="Templates">Templates</msg>
   <msg key="Term">Term</msg>
   <msg key="term">Term</msg>
+  <msg key="Term_eg_Spring_Fall">Term (e.g. Spring, Fall)</msg>
   <msg key="Term_ID">Term ID</msg>
   <msg key="term_properties">term properties.</msg>
   <msg key="Terms">Terms</msg>
Index: openacs-4/packages/dotlrn/www/admin/term-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.tcl,v
diff -u -r1.6.2.2.4.1 -r1.6.2.2.4.2
--- openacs-4/packages/dotlrn/www/admin/term-edit.tcl	25 Aug 2004 15:50:58 -0000	1.6.2.2.4.1
+++ openacs-4/packages/dotlrn/www/admin/term-edit.tcl	11 Oct 2004 06:22:00 -0000	1.6.2.2.4.2
@@ -45,18 +45,22 @@
 
     term_id:key
 
-    {term_name:text               {label "Term (e.g. Spring, Fall)"}
+    {term_name:text               {label "[_ dotlrn.Term_eg_Spring_Fall]"}
                                   {html {size 30}}}
 
-    {term_year:text               {label "Year (e.g. 2003, 2003/2004)"}
+    {term_year:text               {label "[_ dotlrn.lt_Year_eg_2003_20032004]"}
                                   {html {size 9 maxlength 9}}}
 
-    {start_date:date              {label "Start Date"}
-                                  {format {MONTH DD YYYY}}}
+    {start_date:date
+	{label "[_ dotlrn.Start_Date]"}
+	{format {[lc_get formbuilder_date_format]}}
+    }
 
-    {end_date:date                {label "End Date"}
-                                  {format {MONTH DD YYYY}}}
-
+    {end_date:date
+	{label "[_ dotlrn.End_Date]"}
+	{format {[lc_get formbuilder_date_format]}}
+    }
+    
 } -validate {
     {start_date
         { [template::util::date::compare $start_date $end_date] <= 0 }
Index: openacs-4/packages/dotlrn/www/admin/term-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.tcl,v
diff -u -r1.8.6.1 -r1.8.6.2
--- openacs-4/packages/dotlrn/www/admin/term-new.tcl	25 Aug 2004 15:50:58 -0000	1.8.6.1
+++ openacs-4/packages/dotlrn/www/admin/term-new.tcl	11 Oct 2004 06:22:00 -0000	1.8.6.2
@@ -31,16 +31,19 @@
 
 ad_form -name add_term -export referer -form {
 
-    {term_name:text          {label "Term (e.g. Spring, Fall)"} {maxlength 20}
+    {term_name:text          {label "[_ dotlrn.Term_eg_Spring_Fall]"} {maxlength 20}
     {html {size 30}}}
 
     {start_date:date
-                             {label "Start Date"}
-                             {format {MONTH DD YYYY}}}
+	{label "[_ dotlrn.Start_Date]"}
+	{format {[lc_get formbuilder_date_format]}}
+    }
 
     {end_date:date
-                             {label "End Date"}
-                             {format {MONTH DD YYYY}}}
+	{label "[_ dotlrn.End_Date]"}
+	{format {[lc_get formbuilder_date_format]}}
+    }
+
 } -validate {
     {start_date
         { [template::util::date::compare $start_date $end_date] <= 0 }