Index: openacs-4/contrib/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/catalog/Attic/simulation.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/contrib/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	18 Mar 2004 10:07:51 -0000	1.1.2.2
+++ openacs-4/contrib/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	18 Mar 2004 13:46:42 -0000	1.1.2.3
@@ -20,9 +20,16 @@
   <msg key="Document_Portfolio">Document Portfolio</msg>
   <msg key="Documents">Documents</msg>
   <msg key="Edit">Edit</msg>
+  <msg key="enrollment_notification_email_body">Dear %user_name%,
+This is to notify you that you have been enrolled in simulation %sim_template.pretty_name%. You may visit the
+casting page at %casting_page_url% to choose case or role.</msg>
+  <msg key="enrollment_notification_email_subject">You have been enrolled in simulation %sim_template.pretty_name%</msg>
   <msg key="ignoring_actions">&lt;strong&gt;Note:&lt;/strong&gt; Ignoring %ignored_actions_count% tasks that don't have the task
       name &quot;%action.pretty_name%&quot;. Please back up your browser if you
       want to change the selection of tasks.</msg>
+  <msg key="invitation_email_body">Dear %user_name%,
+You have been invited to join simulation %sim_template.pretty_name%. Please visit the enrollment page at %enrollment_page_url% to accept the invitation. Thank you!</msg>
+  <msg key="invitation_email_subject">You have been invited to join simulation %sim_template.pretty_name%</msg>
   <msg key="Invitations_are_sent">&lt;b&gt;Invitations&lt;/b&gt; are sent, 
     when this wizard is completed and
     casting begins.</msg>
@@ -100,6 +107,20 @@
   <msg key="Manage_groups">Manage groups</msg>
   <msg key="Map_XML">Map XML</msg>
   <msg key="message">message</msg>
+  <msg key="message_notificaiton_email_subject">[SimPlay] New message in simulation %simulation_name: %subject%</msg>
+  <msg key="message_notification_email_body">You have just received the following message in simulation %simulation_name%:
+
+-----------------------------------------------------
+subject: %subject%
+
+body:
+
+%body%
+-----------------------------------------------------
+
+Please visit %simplay_url% to continue playing the simulation.
+
+Thank you.</msg>
   <msg key="Messages">Messages</msg>
   <msg key="messages">messages</msg>
   <msg key="My_Notifications">My Notifications</msg>
@@ -109,10 +130,19 @@
   <msg key="Portfolio">Portfolio</msg>
   <msg key="Recent_Messages">Recent Messages</msg>
   <msg key="Related_Tasks">Related Tasks</msg>
+  <msg key="reminder_email_body">Dear %user_name%,
+this email is sent to you as a reminder that you are participating in simulation %simulation_name% that will start on %simulation_start_date%. Here is the
+simulation description:
+
+%simulation_description%</msg>
+  <msg key="reminder_email_subject">Simulation %simulation_name% starts on %simulation_start_date%</msg>
   <msg key="Roles">Roles</msg>
   <msg key="SimBuild">SimBuild</msg>
   <msg key="SimInst">SimInst</msg>
   <msg key="SimPlay">SimPlay</msg>
+  <msg key="simulation_started_email_body">Dear %user_name%,
+Simulation %simulation.pretty_name% has now started. Please visit %simplay_url% to participate. Thank you!</msg>
+  <msg key="simulation_started_email_subject">Simulation %simulation.pretty_name% has started</msg>
   <msg key="States">States</msg>
   <msg key="Sub-States">Sub-States</msg>
   <msg key="Sub-Tasks">Sub-Tasks</msg>
Index: openacs-4/contrib/packages/simulation/tcl/message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/message-procs.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/contrib/packages/simulation/tcl/message-procs.tcl	17 Mar 2004 09:15:08 -0000	1.5.2.1
+++ openacs-4/contrib/packages/simulation/tcl/message-procs.tcl	18 Mar 2004 13:46:43 -0000	1.5.2.2
@@ -78,25 +78,16 @@
         }
         workflow::case::get -case_id $case_id -array case
         workflow::get -workflow_id $case(workflow_id) -array workflow
-        set notif_subject "\[SimPlay\] New message in simulation $workflow(pretty_name): $subject"
+
+        # I18N message variables:
+        set simulation_name $workflow(pretty_name)
         set package_id [ad_conn package_id]
         set simplay_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay" { workflow_id }]
-        set notif_body "You have just received the following message in simulation $workflow(pretty_name):
 
------------------------------------------------------
-subject: $subject
+        set notif_subject [_ simulation.message_notificaiton_email_subject]
+        set notif_body [_ simulation.message_notification_email_body]
 
-body:
-
-$body
------------------------------------------------------
-
-Please visit $simplay_url to continue playing the simulation.
-
-Thank you.
-"
-
         notification::new \
             -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
             -object_id [ad_conn package_id] \
Index: openacs-4/contrib/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/template-procs.tcl,v
diff -u -r1.66.2.4 -r1.66.2.5
--- openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	17 Mar 2004 12:32:34 -0000	1.66.2.4
+++ openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	18 Mar 2004 13:46:43 -0000	1.66.2.5
@@ -511,14 +511,11 @@
     if { [string equal $sim_template(casting_type) "open"] || [string equal $sim_template(casting_type) "group"] } {
         # Notify users that they are enrolled and can do their casting
 
-        set subject "You have been enrolled in simulation $sim_template(pretty_name)"
+        set subject [_ simulation.enrollment_notification_email_subject]
         set package_id [ad_conn package_id]
         set casting_page_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/cast" { workflow_id }]
-        set body "Dear $user_name,
-This is to notify you that you have been enrolled in simulation $sim_template(pretty_name). You may visit the
-casting page at ${casting_page_url} to choose case or role.
-"
+        set body [_ simulation.enrollment_notification_email_body]
 
         acs_mail_lite::send \
             -to_addr $email \
@@ -619,9 +616,8 @@
         set package_id [ad_conn package_id]
         set enrollment_page_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/enroll" { workflow_id }]
-        set subject "You have been invited to join simulation $sim_template(pretty_name)"
-        set body "Dear $user_name,
-You have been invited to join simulation $sim_template(pretty_name). Please visit the enrollment page at $enrollment_page_url to accept the invitation. Thank you!"
+        set subject [_ simulation.invitation_email_subject]
+        set body [_ simulation.invitation_email_body]
         acs_mail_lite::send \
             -to_addr $email \
             -from_addr [ad_system_owner] \
@@ -681,13 +677,9 @@
         set simulation_start_date [lindex $row 5]
         set simulation_description [lindex $row 6]
 
-        set subject "Simulation $simulation_name starts on $simulation_start_date"
-        set body "Dear $user_name,
-this email is sent to you as a reminder that you are participating in simulation $simulation_name that will start on $simulation_start_date. Here is the
-simulation description:
+        set subject [_ simulation.reminder_email_subject]
+        set body [_ simulation.reminder_email_body]
 
-$simulation_description"
-
         acs_mail_lite::send \
             -to_addr $email \
             -from_addr [ad_system_owner] \
@@ -747,9 +739,8 @@
         set package_id [ad_conn package_id]
         set simplay_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/enroll" { workflow_id }]
-        set subject "Simulation $simulation(pretty_name) has started"
-        set body "Dear $user_name,
-Simulation $simulation(pretty_name) has now started. Please visit $simplay_url to participate. Thank you!"
+        set subject [_ simulation.simulation_started_email_subject]
+        set body [_ simulation.simulation_started_email_body]
 
         acs_mail_lite::send \
             -to_addr $email \
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.tcl,v
diff -u -r1.22.2.2 -r1.22.2.3
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	17 Mar 2004 09:45:56 -0000	1.22.2.2
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl	18 Mar 2004 13:46:43 -0000	1.22.2.3
@@ -38,7 +38,7 @@
         set return_url [export_vars -base tasks { case_id role_id }]
     }
 
-    if { [info exists body] } {
+    if { [info exists body] && [info exists received_message_item_id] } {
         # We have a prepopulated body. This means we are responding to a message (see else clause below)
         # Display a listing of any attachments in the message being responded to
         set attachments_set_list [bcms::item::list_related_items \
Index: openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	18 Mar 2004 10:07:51 -0000	1.1.2.2
+++ openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml	18 Mar 2004 13:46:42 -0000	1.1.2.3
@@ -20,9 +20,16 @@
   <msg key="Document_Portfolio">Document Portfolio</msg>
   <msg key="Documents">Documents</msg>
   <msg key="Edit">Edit</msg>
+  <msg key="enrollment_notification_email_body">Dear %user_name%,
+This is to notify you that you have been enrolled in simulation %sim_template.pretty_name%. You may visit the
+casting page at %casting_page_url% to choose case or role.</msg>
+  <msg key="enrollment_notification_email_subject">You have been enrolled in simulation %sim_template.pretty_name%</msg>
   <msg key="ignoring_actions">&lt;strong&gt;Note:&lt;/strong&gt; Ignoring %ignored_actions_count% tasks that don't have the task
       name &quot;%action.pretty_name%&quot;. Please back up your browser if you
       want to change the selection of tasks.</msg>
+  <msg key="invitation_email_body">Dear %user_name%,
+You have been invited to join simulation %sim_template.pretty_name%. Please visit the enrollment page at %enrollment_page_url% to accept the invitation. Thank you!</msg>
+  <msg key="invitation_email_subject">You have been invited to join simulation %sim_template.pretty_name%</msg>
   <msg key="Invitations_are_sent">&lt;b&gt;Invitations&lt;/b&gt; are sent, 
     when this wizard is completed and
     casting begins.</msg>
@@ -100,6 +107,20 @@
   <msg key="Manage_groups">Manage groups</msg>
   <msg key="Map_XML">Map XML</msg>
   <msg key="message">message</msg>
+  <msg key="message_notificaiton_email_subject">[SimPlay] New message in simulation %simulation_name: %subject%</msg>
+  <msg key="message_notification_email_body">You have just received the following message in simulation %simulation_name%:
+
+-----------------------------------------------------
+subject: %subject%
+
+body:
+
+%body%
+-----------------------------------------------------
+
+Please visit %simplay_url% to continue playing the simulation.
+
+Thank you.</msg>
   <msg key="Messages">Messages</msg>
   <msg key="messages">messages</msg>
   <msg key="My_Notifications">My Notifications</msg>
@@ -109,10 +130,19 @@
   <msg key="Portfolio">Portfolio</msg>
   <msg key="Recent_Messages">Recent Messages</msg>
   <msg key="Related_Tasks">Related Tasks</msg>
+  <msg key="reminder_email_body">Dear %user_name%,
+this email is sent to you as a reminder that you are participating in simulation %simulation_name% that will start on %simulation_start_date%. Here is the
+simulation description:
+
+%simulation_description%</msg>
+  <msg key="reminder_email_subject">Simulation %simulation_name% starts on %simulation_start_date%</msg>
   <msg key="Roles">Roles</msg>
   <msg key="SimBuild">SimBuild</msg>
   <msg key="SimInst">SimInst</msg>
   <msg key="SimPlay">SimPlay</msg>
+  <msg key="simulation_started_email_body">Dear %user_name%,
+Simulation %simulation.pretty_name% has now started. Please visit %simplay_url% to participate. Thank you!</msg>
+  <msg key="simulation_started_email_subject">Simulation %simulation.pretty_name% has started</msg>
   <msg key="States">States</msg>
   <msg key="Sub-States">Sub-States</msg>
   <msg key="Sub-Tasks">Sub-Tasks</msg>
Index: openacs-4/packages/simulation/tcl/message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/message-procs.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/simulation/tcl/message-procs.tcl	17 Mar 2004 09:15:08 -0000	1.5.2.1
+++ openacs-4/packages/simulation/tcl/message-procs.tcl	18 Mar 2004 13:46:43 -0000	1.5.2.2
@@ -78,25 +78,16 @@
         }
         workflow::case::get -case_id $case_id -array case
         workflow::get -workflow_id $case(workflow_id) -array workflow
-        set notif_subject "\[SimPlay\] New message in simulation $workflow(pretty_name): $subject"
+
+        # I18N message variables:
+        set simulation_name $workflow(pretty_name)
         set package_id [ad_conn package_id]
         set simplay_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay" { workflow_id }]
-        set notif_body "You have just received the following message in simulation $workflow(pretty_name):
 
------------------------------------------------------
-subject: $subject
+        set notif_subject [_ simulation.message_notificaiton_email_subject]
+        set notif_body [_ simulation.message_notification_email_body]
 
-body:
-
-$body
------------------------------------------------------
-
-Please visit $simplay_url to continue playing the simulation.
-
-Thank you.
-"
-
         notification::new \
             -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
             -object_id [ad_conn package_id] \
Index: openacs-4/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/template-procs.tcl,v
diff -u -r1.66.2.4 -r1.66.2.5
--- openacs-4/packages/simulation/tcl/template-procs.tcl	17 Mar 2004 12:32:34 -0000	1.66.2.4
+++ openacs-4/packages/simulation/tcl/template-procs.tcl	18 Mar 2004 13:46:43 -0000	1.66.2.5
@@ -511,14 +511,11 @@
     if { [string equal $sim_template(casting_type) "open"] || [string equal $sim_template(casting_type) "group"] } {
         # Notify users that they are enrolled and can do their casting
 
-        set subject "You have been enrolled in simulation $sim_template(pretty_name)"
+        set subject [_ simulation.enrollment_notification_email_subject]
         set package_id [ad_conn package_id]
         set casting_page_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/cast" { workflow_id }]
-        set body "Dear $user_name,
-This is to notify you that you have been enrolled in simulation $sim_template(pretty_name). You may visit the
-casting page at ${casting_page_url} to choose case or role.
-"
+        set body [_ simulation.enrollment_notification_email_body]
 
         acs_mail_lite::send \
             -to_addr $email \
@@ -619,9 +616,8 @@
         set package_id [ad_conn package_id]
         set enrollment_page_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/enroll" { workflow_id }]
-        set subject "You have been invited to join simulation $sim_template(pretty_name)"
-        set body "Dear $user_name,
-You have been invited to join simulation $sim_template(pretty_name). Please visit the enrollment page at $enrollment_page_url to accept the invitation. Thank you!"
+        set subject [_ simulation.invitation_email_subject]
+        set body [_ simulation.invitation_email_body]
         acs_mail_lite::send \
             -to_addr $email \
             -from_addr [ad_system_owner] \
@@ -681,13 +677,9 @@
         set simulation_start_date [lindex $row 5]
         set simulation_description [lindex $row 6]
 
-        set subject "Simulation $simulation_name starts on $simulation_start_date"
-        set body "Dear $user_name,
-this email is sent to you as a reminder that you are participating in simulation $simulation_name that will start on $simulation_start_date. Here is the
-simulation description:
+        set subject [_ simulation.reminder_email_subject]
+        set body [_ simulation.reminder_email_body]
 
-$simulation_description"
-
         acs_mail_lite::send \
             -to_addr $email \
             -from_addr [ad_system_owner] \
@@ -747,9 +739,8 @@
         set package_id [ad_conn package_id]
         set simplay_url \
             [export_vars -base "[ad_url][apm_package_url_from_id $package_id]simplay/enroll" { workflow_id }]
-        set subject "Simulation $simulation(pretty_name) has started"
-        set body "Dear $user_name,
-Simulation $simulation(pretty_name) has now started. Please visit $simplay_url to participate. Thank you!"
+        set subject [_ simulation.simulation_started_email_subject]
+        set body [_ simulation.simulation_started_email_body]
 
         acs_mail_lite::send \
             -to_addr $email \
Index: openacs-4/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.tcl,v
diff -u -r1.22.2.2 -r1.22.2.3
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl	17 Mar 2004 09:45:56 -0000	1.22.2.2
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl	18 Mar 2004 13:46:43 -0000	1.22.2.3
@@ -38,7 +38,7 @@
         set return_url [export_vars -base tasks { case_id role_id }]
     }
 
-    if { [info exists body] } {
+    if { [info exists body] && [info exists received_message_item_id] } {
         # We have a prepopulated body. This means we are responding to a message (see else clause below)
         # Display a listing of any attachments in the message being responded to
         set attachments_set_list [bcms::item::list_related_items \