Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.80 -r1.81
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	2 Feb 2008 21:15:46 -0000	1.80
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	22 Feb 2008 23:42:32 -0000	1.81
@@ -669,4 +669,29 @@
   <msg key="when_this_will">When this will be executed?</msg>
   <msg key="yes">Yes</msg>
   <msg key="yesterday">Yesterday</msg>
+  <msg key="Actions_Performed">Action Performed</msg>
+  <msg key="Reviewer_Comments">Reviewer Comments</msg>
+  <msg key="No_reviewer_comments_have_been_added_to_this_assessment_yet">No reviewer comments have been added to this assessment yet.</msg>
+  <msg key="Admin">Admin</msg>
+  <msg key="Item_Question">Item Question</msg>
+  <msg key="Points">Points</msg>
+  <msg key="Multiple_Choice">Multiple Choice</msg>
+  <msg key="Correct_Answer">Correct Answer</msg>
+  <msg key="Or_use_choices_from_an_existing_question">Or use choices from an existing question</msg>
+  <msg key="Short_Answer">Short Answer</msg>
+  <msg key="Long_Answer">Long Answer</msg>
+  <msg key="File_Upload">File Upload</msg>
+  <msg key="Points_for_Question_Optional">Points for Question<br>(Optional)</msg>
+  <msg key="Feedback_right_Optional">Feedback right<br>(Optional)</msg>
+  <msg key="Feedback_wrong_Optional">Feedback wrong<br>(Optional)</msg>
+  <msg key="Advanced_Options">Advanced Options</msg>
+  <msg key="users_in_community">users in community</msg>
+  <msg key="complete_responses">complete responses</msg>
+  <msg key="incomplete_responses">incomplete responses</msg>
+  <msg key="Publish_failed_Following_section_s_have_no_questions">Publish failed. Following section(s) have no questions: %empty_sections%</msg>
+  <msg key="anonymous">this assessment is anonymous</msg>
+  <msg key="Untaken">Untaken</msg>
+  <msg key="Finish">Finish</msg>
+  <msg key="Take">Take</msg>
+  <msg key="Retake">Retake</msg>
 </message_catalog>
Index: openacs-4/packages/assessment/lib/actions-results.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/actions-results.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/actions-results.adp	21 Feb 2005 14:32:55 -0000	1.1
+++ openacs-4/packages/assessment/lib/actions-results.adp	22 Feb 2008 23:42:32 -0000	1.2
@@ -1,4 +1,4 @@
-<h2>Actions Performed:</h2>
+<h2>#assessment.Actions_Performed#:</h2>
 <multiple name="actions">
  @actions.user_message@
 <if @actions.error_txt@ ne nil>
Index: openacs-4/packages/assessment/lib/comments-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/comments-chunk.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/lib/comments-chunk.adp	2 Feb 2008 21:15:46 -0000	1.5
+++ openacs-4/packages/assessment/lib/comments-chunk.adp	22 Feb 2008 23:42:32 -0000	1.6
@@ -1,19 +1,19 @@
 <if @has_permission_p@>
-<h2>Reviewer Comments</h2>
+<h2>#assessment.Reviewer_Comments#</h2>
 <if @comments:rowcount@ gt 0>
   <multiple name="comments">
     <div><b>@comments.title@</b> <a href="@comments.edit_url@"></a></div>
     <div>
       @comments.html_content;noquote@
     </div>
-    <div>- @comments.author@ (on @comments.creation_date_ansi@)</div>
+    <div>- @comments.author@ (@comments.creation_date_ansi@)</div>
   </multiple>
 </if>
 <else>
-  <p style="font-style:italic">No reviewer comments have been added to this assessment yet.</p>
+  <p style="font-style:italic">#assessment.No_reviewer_comments_have_been_added_to_this_assessment_yet#</p>
 </else>
 
 <div>
-  <a href="@comment_add_url@" class="button">Add comment</a>
+  <a href="@comment_add_url@" class="button">#assessment.Add_Comment#</a>
 </div>
 </if>
Index: openacs-4/packages/assessment/lib/section-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-links.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/section-links.adp	26 Jan 2007 20:29:59 -0000	1.2
+++ openacs-4/packages/assessment/lib/section-links.adp	22 Feb 2008 23:42:32 -0000	1.3
@@ -1,31 +1,9 @@
 <h1>@assessment_data.title;noquote@</h1>
 <ul>
-  <li><if @tab@ eq "front">Admin</if>
-      <else><a href="@assessment_url@">Admin</a></else></li> 
-  <li><if @tab@ eq "questions">Questions</if>
-      <else><a href="@questions_url@">Questions</a></else></li> 
-  <li><if @tab@ eq "results">Results</if>
-      <else><a href="results-users?assessment_id=@assessment_id@">Results</a></else></li>
+  <li><if @tab@ eq "front">#assessment.Admin#</if>
+      <else><a href="@assessment_url@">#assessment.Admin#</a></else></li> 
+  <li><if @tab@ eq "questions">#assessment.Questions#</if>
+      <else><a href="@questions_url@">#assessment.Questions#</a></else></li> 
+  <li><if @tab@ eq "results">#assessment.Results#</if>
+      <else><a href="results-users?assessment_id=@assessment_id@">#assessment.Results#</a></else></li>
 </ul>
-
-<!--
-vinodk: remove this
-<p>
-
-<if @tab@ eq "front">@assessment_data.title;noquote@ Admin | </if>
-<else><a href="@assessment_url@">@assessment_data.title;noquote@ Admin</a> | </else>
-
-<if @tab@ eq "results">Results | </if>
-<else><a href="results-users?assessment_id=@assessment_id@">Results</a> | </else>
-
-<if @sections:rowcount@>
-<multiple name="sections" delimiter=" | ">
-  <if @tab@ eq @sections.section_id@>@sections.title@</if>
-  <else><a href="@sections.section_url@">@sections.title@</a></else>
-</multiple>
-</if>
-<else>
-No Sections
-</else>
-</p>
--->
\ No newline at end of file
Index: openacs-4/packages/assessment/tcl/as-session-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/tcl/as-session-procs.tcl	15 May 2007 20:14:17 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-session-procs.tcl	22 Feb 2008 23:42:33 -0000	1.9
@@ -90,6 +90,10 @@
             content::item::delete -item_id $comment_id
         }
     }
+
+    db_dml delete_choices {}
+    db_dml delete_session_items {}
+
     set session_item_id [content::revision::item_id -revision_id $session_id]
     content::revision::delete -revision_id $session_id
 
Index: openacs-4/packages/assessment/tcl/as-session-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/tcl/as-session-procs.xql	15 May 2007 20:14:17 -0000	1.3
+++ openacs-4/packages/assessment/tcl/as-session-procs.xql	22 Feb 2008 23:42:33 -0000	1.4
@@ -35,6 +35,18 @@
 </querytext>
 </fullquery>
 
+<fullquery name="as::session::delete.delete_choices">
+<querytext>
+DELETE FROM as_session_choices WHERE  session_id = :session_id;
+</querytext>
+</fullquery>
+
+<fullquery name="as::session::delete.delete_session_items">
+<querytext>
+delete from as_session_items where session_id =  :session_id;
+</querytext>
+</fullquery>
+
 <fullquery name="as::session::delete.get_comments">
 <querytext>
 select g.comment_id
Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/assessment/www/index.tcl	15 May 2007 20:14:17 -0000	1.18
+++ openacs-4/packages/assessment/www/index.tcl	22 Feb 2008 23:42:33 -0000	1.19
@@ -59,7 +59,7 @@
             display_template {@sessions.title;noquote@}
         }
         session {
-            label {[_ assessment.Sessions]}
+            label "[_ assessment.Sessions]"
             link_url_eval {[export_vars -base "sessions" {assessment_id}]}
         }
     } -main_class {
@@ -68,7 +68,7 @@
 
 # get the information of all assessments store in the database
 db_multirow -extend { session } sessions answered_asssessments {} {
-    set session {Sessions}
+    set session [_ assessment.Sessions]
 }
 
 set admin_p [ad_permission_p $package_id create]
Index: openacs-4/packages/assessment/www/asm-admin/item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	2 Feb 2008 21:15:46 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	22 Feb 2008 23:42:33 -0000	1.8
@@ -4,7 +4,7 @@
 <formtemplate id="item-add" style="accessible-forms">
 <!-- Form elements -->
 <fieldset>
-<legend>Question</legend>
+<legend>#assessment.Question#</legend>
   <formwidget id=__confirmed_p><formwidget id=__refreshing_p><formwidget id=assessment_id><formwidget id=section_id><formwidget id=after><formwidget id=type><formwidget id=__key_signature><formwidget id=__new_p><formwidget id=as_item_id><formwidget id="num_choices">
       <br>
         
@@ -16,7 +16,7 @@
               </else>
             
             <label for="question_text">
-              Item Question
+              #assessment.Item_Question#
             </label>
             <span class="form-required-mark">*</span>
           </span>
@@ -53,7 +53,7 @@
               </else>
             
             <label for="required_p">
-              Required
+              #assessment.Required#
             </label>
             
           </span>
@@ -88,7 +88,7 @@
               </else>
             
             <label for="feedback_right">
-              Feedback right
+              #assessment.Feedback_right#
             </label>
             
           </span>
@@ -123,7 +123,7 @@
               </else>
             
             <label for="feedback_wrong">
-              Feedback wrong
+              #assessment.Feedback_wrong#
             </label>
             
           </span>
@@ -154,7 +154,7 @@
             <span class="form-label">
           </else>
              <label for="points">
-              Points
+              #assessment.Points#
              </label>
            </span>
            <if @formerror.points@ not nil>
@@ -196,12 +196,12 @@
             </formerror>
 
 <div style="float:right; width: 40%;">        <fieldset>
-        <legend>Multiple Choice</legend>
+        <legend>#assessment.Multiple_Choice#</legend>
 <p class="form-help-text">       #assessment.item_type_multiple_choice_help#</p>
         <formgroup-widget id="item_type" row=2></formgroup-widget><br>
         <formgroup-widget id="item_type" row=5></formgroup-widget>
            
-       <p><span class="form-label">Correct<br>Answer</span><br>
+       <p><span class="form-label">#assessment.Correct_Answer#</span><br>
         <multiple name="choice_elements">
        <formgroup id="correct.@choice_elements.id@">
                 @formgroup.widget;noquote@
@@ -214,30 +214,30 @@
            </formgroup>
 
 <formwidget id="formbutton_add_another_choice"><br>
-<if @choice_sets@ not nil><p>Or use choices from an existing question<br>
+<if @choice_sets@ not nil><p>#assessment.Or_use_choices_from_an_existing_question#<br>
 <formwidget id="add_existing_mc_id">
 </p></if>
 <br>
 </fieldset>        
 </div>
 <div>
 <fieldset>
-<legend>Short Answer</legend>
+<legend>#assessment.Short_Answer#</legend>
 <p class="form-help-text">       #assessment.item_type_short_answer_help#</p>
         <formgroup-widget id="item_type" row=4></formgroup-widget>
 </fieldset>
 <fieldset>
-<legend>Long Answer</legend>
+<legend>#assessment.Long_Answer#</legend>
 <p class="form-help-text">       #assessment.item_type_long_answer_help#</p>
         <formgroup-widget id="item_type" row=3></formgroup-widget>
 <br>
             <label for="reference_answer">
-              Reference Answer
+              #assessment.Reference_Answer#
             </label>	<formwidget id="reference_answer">
 <p class="form-help-text">        <formhelp id="reference_answer"></p>
 </fieldset>
 <fieldset>
-<legend>File Upload</legend>
+<legend>#assessment.File_Upload#</legend>
 <p class="form-help-text">        #assessment.item_type_file_upload_help#</p>
 <formgroup-widget id="item_type" row=1></formgroup-widget>
 </fieldset>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	2 Feb 2008 21:15:46 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	22 Feb 2008 23:42:33 -0000	1.7
@@ -14,7 +14,7 @@
               </else>
 
             <label for="question_text">
-              Question
+              #assessment.Question#
             </label>
             </span>
 
@@ -49,7 +49,7 @@
               </else>
             
             <label for="required_p">
-              Required
+              #assessment.Required#
             </label>
 
             
@@ -86,7 +86,7 @@
               </else>
             
             <label for="points">
-              Points for Question<br>(Optional)
+              #assessment.Points_for_Question_Optional#
             </label>
 
             
@@ -122,7 +122,7 @@
               </else>
             
             <label for="feedback_right">
-              Feedback right<br>(Optional)
+	     #assessment.Feedback_right_Optional#
             </label>
 
             
@@ -159,7 +159,7 @@
               </else>
             
             <label for="feedback_wrong">
-              Feedback wrong<br>(Optional)
+	     #assessment.Feedback_wrong_Optional#
             </label>
 
             
@@ -212,7 +212,7 @@
 <case value="mc">
 <div><formwidget id="num_choices"></div>
          
-       <p><span class="form-label">Correct<br>Answer</span><br>
+       <p><span class="form-label">#assessment.Correct_Answer#</span><br>
         <multiple name="choice_elements">
     
            <formgroup id="correct.@choice_elements.id@">
@@ -255,4 +255,4 @@
 </p>
 </formtemplate>
 
-<a href="@advanced_options_url@">Advanced Options</a>
+<a href="@advanced_options_url@">#assessment.Advanced_Options#</a>
Index: openacs-4/packages/assessment/www/asm-admin/results-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/results-users.adp	7 Oct 2007 22:36:54 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/results-users.adp	22 Feb 2008 23:42:33 -0000	1.7
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="results">
-<p>@count_all_users@ users in community, @count_complete@ complete responses, @count_incomplete@ incomplete responses</p>
+<p>@count_all_users@ #assessment.users_in_community#, @count_complete@ #assessment.complete_responses#, @count_incomplete@ #assessment.incomplete_responses#</p>
 <listfilters name="results" style="inline-filters"></listfilters>
 <listtemplate name="results"></listtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl	7 Oct 2007 22:36:54 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/toggle-publish.tcl	22 Feb 2008 23:42:33 -0000	1.4
@@ -24,7 +24,7 @@
     db_dml toggle_publish ""
     set message ""
 } else {
-    set message "Publish failed. Following section(s) have no questions: ${empty_sections}"
+    set message [_ assessment.Publish_failed_Following_section_s_have_no_questions]
 }
 
 if {$return_url eq ""} {