Index: openacs-4/packages/bug-tracker/www/patch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/patch.tcl	29 Mar 2004 15:07:34 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/patch.tcl	20 Apr 2004 14:19:35 -0000	1.10
@@ -57,19 +57,19 @@
 # We are in view mode per default
 if { ![info exists mode] } {
     if { [exists_and_not_null edit] } {
-        set mode "[_ bug-tracker.edit]"
+        set mode edit
     } elseif { [exists_and_not_null accept] } {        
-        set mode "[_ bug-tracker.accept]"
+        set mode accept
     } elseif { [exists_and_not_null refuse] } {
-        set mode "[_ bug-tracker.refuse]"
+        set mode refuse
     } elseif { [exists_and_not_null delete] } {
-        set mode "[_ bug-tracker.delete]"
+        set mode delete
     } elseif { [exists_and_not_null reopen] } {
-        set mode "[_ bug-tracker.reopen]"
+        set mode reopen
     } elseif { [exists_and_not_null comment] } {
-        set mode "[_ bug-tracker.comment]"
+        set mode comment
     } else {
-        set mode "[_ bug-tracker.view]"
+        set mode view
     }
 }
 
@@ -97,13 +97,13 @@
     }
     reopen {
         # User must have write permission to reopen a refused patch
-        if { [string equal $patch_status "[_ bug-tracker.refused]"] && !$write_p } {
+        if { [string equal $patch_status "refused"] && !$write_p } {
             ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_3]"
             ad_script_abort
-        } elseif { [string equal $patch_status "[_ bug-tracker.deleted]"] && !($user_is_submitter_p || $write_p)} {
+        } elseif { [string equal $patch_status "deleted"] && !($user_is_submitter_p || $write_p)} {
             ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_4]"
-            ad_script_abort            
-        } 
+            ad_script_abort
+        }
 
         set edit_fields {}
     }
@@ -127,7 +127,7 @@
     set field_editable_p($field) 1
 }
 
-if { ![string equal $mode "[_ bug-tracker.view]"] } {
+if { ![string equal $mode "view"] } {
     ad_maybe_redirect_for_registration
 }    
 
@@ -159,7 +159,7 @@
         -label "[_ bug-tracker.Component]" \
         -options [bug_tracker::components_get_options]
 
-if { [string equal $mode "[_ bug-tracker.view]"] } {
+if { [string equal $mode "view"] } {
     element create patch fixes_bugs \
         -datatype text \
         -widget inform \
@@ -230,7 +230,7 @@
 
 # In accept mode - give the user the ability to select associated
 # bugs to be resolved
-if { [string equal $mode "[_ bug-tracker.accept]"] } {
+if { [string equal $mode "accept"] } {
 
     element create patch resolve_bugs \
             -datatype integer \
@@ -240,7 +240,7 @@
             -optional
 }
 
-if { [string equal $mode "[_ bug-tracker.edit]"] } {
+if { [string equal $mode "edit"] } {
     # Edit mode - display the file upload widget for patch content
     element create patch patch_file \
           -datatype file \
@@ -276,16 +276,16 @@
     # - update the status (the new status will show up in the form)
     switch -- $mode {
         accept {
-            set patch(status) "[_ bug-tracker.accepted]"
+            set patch(status) accepted
         }
         refuse {
-            set patch(status) "[_ bug-tracker.refused]"
+            set patch(status) refused
         }
         delete {
-            set patch(status) "[_ bug-tracker.deleted]"
+            set patch(status) deleted
         }
         reopen {
-            set patch(status) "[_ bug-tracker.open]"
+            set patch(status) open
         }
     }
 
@@ -295,7 +295,7 @@
             -value $patch(patch_number)
     element set_properties patch component_id \
             -value [ad_decode [info exists field_editable_p(component_id)] 1 $patch(component_id) $patch(component_name)]
-    if { [string equal $mode "[_ bug-tracker.view]"] } {
+    if { [string equal $mode "view"] } {
         set bugs_name [bug_tracker::conn bugs]
 	set map_to_bugs [_ bug-tracker.Map] 
         set map_new_bug_link [ad_decode $write_or_submitter_p "1" "\[ <a href=\"map-patch-to-bugs?patch_number=$patch(patch_number)\">$map_to_bugs</a> \]" ""]
@@ -320,7 +320,7 @@
 
     set deleted_p [string equal $patch(status) deleted]
 
-    if { ( [string equal $patch(status) open] && ![string equal $mode [_ bug-tracker.accept]]) || [string equal $patch(status) [_ bug-tracker.refused]] } {
+    if { ( [string equal $patch(status) open] && ![string equal $mode accept]) || [string equal $patch(status) refused] } {
         element set_properties patch applied_to_version -widget hidden
     }
 
@@ -333,7 +333,7 @@
         <blockquote>[bug_tracker::bug_convert_comment_to_html -comment $comment -format $comment_format]</blockquote>"
     }
 
-    if { [string equal $mode "[_ bug-tracker.view]"] } {
+    if { [string equal $mode "view"] } {
         element set_properties patch description -value $action_html
     } else {
 
@@ -356,7 +356,7 @@
     # Create the buttons
     # If the user has submitted the patch he gets full write access on the patch
     set user_is_submitter_p [expr $patch(submitter_user_id) == [ad_conn user_id]]
-    if { [string equal $mode "[_ bug-tracker.view]"] } {
+    if { [string equal $mode "view"] } {
         set button_form_export_vars [export_vars -form { patch_number }]
         multirow create button name label
 
@@ -396,7 +396,7 @@
     }    
 
     # Check that the user is permitted to change the patch
-    if { ![string equal $mode "[_ bug-tracker.view]"] && !$write_p && !$user_is_submitter_p } {
+    if { ![string equal $mode "view"] && !$write_p && !$user_is_submitter_p } {
         ns_log notice "$patch(submitter_user_id) doesn't have write on object $patch(patch_id)"
         ad_return_forbidden "[_ bug-tracker.Permission]" "<blockquote>
         [_ bug-tracker.You_6]
@@ -426,15 +426,15 @@
     
     switch -- $mode {
         accept {
-            set status "[_ bug-tracker.accepted]"
+            set status accepted
             lappend update_exprs "status = :status"
         }
         refuse {
-            set status "[_ bug-tracker.refused]"
+            set status refused
             lappend update_exprs "status = :status"            
         }
         reopen {
-            set status "[_ bug-tracker.open]"
+            set status open
             lappend update_exprs "status = :status"
         }
         edit {
@@ -446,7 +446,7 @@
             } 
         }
         delete {
-            set status "[_ bug-tracker.deleted]"
+            set status deleted
             lappend update_exprs "status = :status"            
         }
     }
@@ -469,7 +469,7 @@
         set action $mode
         db_dml patch_action {}
 
-        if { [string equal $mode "[_ bug-tracker.accept]"] } {
+        if { [string equal $mode "accept"] } {
             # Resolve any bugs that the user selected
             set resolve_bugs [element get_values patch resolve_bugs]
 
@@ -478,7 +478,7 @@
                 set resolve_description "[_ bug-tracker.Fixed_2]"                
                 set workflow_id [bug_tracker::bug::get_instance_workflow_id]
                 set bug_id [bug_tracker::get_bug_id -bug_number $bug_number -project_id $package_id]
-                set action_id [workflow::action::get_id -workflow_id $workflow_id -short_name "[_ bug-tracker.resolve]"]
+                set action_id [workflow::action::get_id -workflow_id $workflow_id -short_name resolve]
                 
                 bug_tracker::bug::edit \
                     -bug_id $bug_id \