Index: openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml 29 Mar 2004 15:07:33 -0000 1.2
+++ openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml 20 Apr 2004 14:19:34 -0000 1.3
@@ -15,7 +15,6 @@
"]
} else {
set bugs_name [bug_tracker::conn bugs]
- set bugs_string "[_ bug-tracker.No_Bugs]"
+ set bugs_string [_ bug-tracker.No_Bugs]
}
return $bugs_string
@@ -1090,7 +1110,7 @@
ad_proc bug_tracker::get_patch_links {
{-bug_id:required}
- {-show_patch_status "[_ bug-tracker.open]"}
+ {-show_patch_status open}
} {
set patch_list [list]
@@ -1105,11 +1125,11 @@
db_foreach get_patches_for_bug "" {
- set status_indicator [ad_decode $show_patch_status "[_ bug-tracker.all]" "($status)" ""]
+ set status_indicator [ad_decode $show_patch_status "all" "($status)" ""]
lappend patch_list "[ad_quotehtml $summary] $status_indicator"
} if_no_rows {
set patches_name [bug_tracker::conn patches]
- set patches_string "[_ bug-tracker.No_patches]"
+ set patches_string [_ bug-tracker.No_patches]
}
if { [llength $patch_list] != 0 } {
@@ -1161,10 +1181,8 @@
ns_log notice "bug_tracker::security_violation: $user_id doesn't have permission to '$action(pretty_name)' on bug $bug(summary)"
ad_return_forbidden \
- "[_ bug-tracker.Permission_Denied]" \
- "
- [_ bug-tracker.No_Permission_to_do_action] -" + [_ bug-tracker.Permission_Denied] \ + "
[_ bug-tracker.No_Permission_to_do_action]" ad_script_abort } Index: openacs-4/packages/bug-tracker/www/bug.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.tcl,v diff -u -N -r1.28 -r1.29 --- openacs-4/packages/bug-tracker/www/bug.tcl 29 Mar 2004 15:07:34 -0000 1.28 +++ openacs-4/packages/bug-tracker/www/bug.tcl 20 Apr 2004 14:19:35 -0000 1.29 @@ -7,8 +7,8 @@ } [bug_tracker::get_page_variables { bug_number:integer,notnull {user_agent_p:boolean 0} - {show_patch_status "[_ bug-tracker.open]"} -%}] + {show_patch_status open} +}] ##### # @@ -328,7 +328,7 @@ # Add empty option to resolution code if { ![empty_string_p $enabled_action_id] } { - if { [lsearch [workflow::action::get_element -action_id $action_id -element edit_fields] "[_ bug-tracker.resolution]"] == -1 } { + if { [lsearch [workflow::action::get_element -action_id $action_id -element edit_fields] "resolution"] == -1 } { element set_properties bug resolution -options [concat {{{} {}}} [element get_property bug resolution options]] } } else { @@ -417,38 +417,38 @@ set last_bug_number [lindex $filter_bug_numbers end] set last_url [export_vars -base bug -entire_form -override { { bug_number $last_bug_number } }] } - - multirow create navlinks url img alt label - + + multirow create navlinks url img alt label + if { $filter_bug_index != -1 } { - + set next_bug_num [expr $filter_bug_index+1] set all_bugs [llength $filter_bug_numbers] multirow append navlinks \ $first_url \ "/resources/acs-subsite/stock_first-16.png" \ - "[_ acs-kernel.common_First]" - + [_ acs-kernel.common_first] + multirow append navlinks \ $prev_url \ "/resources/acs-subsite/stock_left-16.png" \ - "[_ acs-kernel.common_Previous]" - + [_ acs-kernel.common_previous] + multirow append navlinks \ {} \ {} \ {} \ - "[_ bug-tracker.No_of_All]" - + [_ bug-tracker.No_of_All] + multirow append navlinks \ $next_url \ "/resources/acs-subsite/stock_right-16.png" \ - "[_ acs-kernel.common_Next]" + [_ acs-kernel.common_next] multirow append navlinks \ $last_url \ "/resources/acs-subsite/stock_last-16.png" \ - "[_ acs-kernel.common_Last]" + [_ acs-kernel.common_last] } - } + } } 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 -N -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" "\[ $map_to_bugs \]" ""] @@ -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 @@
[bug_tracker::bug_convert_comment_to_html -comment $comment -format $comment_format]" } - 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]" "
[_ 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 \ Index: openacs-4/packages/bug-tracker/www/admin/categories.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.adp,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/bug-tracker/www/admin/categories.adp 29 Mar 2004 15:07:35 -0000 1.5 +++ openacs-4/packages/bug-tracker/www/admin/categories.adp 20 Apr 2004 14:19:36 -0000 1.6 @@ -11,8 +11,8 @@#bug-tracker.Category# # @pretty_names.Bugs@ #bug-tracker.Default# -#acs-kernel.common_Edit# -#acs-kernel.common_Delete# +#acs-kernel.common_edit# +#acs-kernel.common_delete# Index: openacs-4/packages/bug-tracker/www/admin/category-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bug-tracker/www/admin/category-edit.tcl 29 Mar 2004 15:07:35 -0000 1.2 +++ openacs-4/packages/bug-tracker/www/admin/category-edit.tcl 20 Apr 2004 14:19:36 -0000 1.3 @@ -15,9 +15,9 @@ } if { [info exists keyword_id] } { - set function [_ acs-kernel.common_Edit] + set function [_ acs-kernel.common_edit] } else { - set function [_ acs-kernel.common_Add] + set function [_ acs-kernel.common_add] } set page_title [_ bug-tracker.function] Index: openacs-4/packages/bug-tracker/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/bug-tracker/www/admin/index.adp 29 Mar 2004 15:07:35 -0000 1.7 +++ openacs-4/packages/bug-tracker/www/admin/index.adp 20 Apr 2004 14:19:36 -0000 1.8 @@ -20,18 +20,18 @@ - #acs-kernel.common_Edit# + #acs-kernel.common_edit# - #acs-kernel.common_Delete# + #acs-kernel.common_delete# Index: openacs-4/packages/bug-tracker/www/admin/versions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/versions.adp,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/bug-tracker/www/admin/versions.adp 29 Mar 2004 15:07:35 -0000 1.6 +++ openacs-4/packages/bug-tracker/www/admin/versions.adp 20 Apr 2004 14:19:36 -0000 1.7 @@ -15,8 +15,8 @@ @project_name@ - + @@ -51,7 +51,7 @@ - + @@ -64,7 +64,7 @@ #bug-tracker.Versions# - + @@ -77,7 +77,7 @@ #bug-tracker.Categories# - + @@ -88,7 +88,7 @@ #bug-tracker.Permissions# - + @@ -99,7 +99,7 @@ #bug-tracker.Parameters# - + @@ -113,7 +113,7 @@ #bug-tracker.Priority_codes# - + @@ -124,7 +124,7 @@ #bug-tracker.Severity_Codes# - + @@ -156,11 +156,11 @@ @components.num_bugs@ @pretty_names.bug@ @pretty_names.bugs@ - + - + #bug-tracker.Planned_Release# #bug-tracker.Maintainer_1# #bug-tracker.Assign# -#acs-kernel.common_Edit# -#acs-kernel.common_Delete# +#acs-kernel.common_edit# +#acs-kernel.common_delete# #bug-tracker.Release# @@ -46,11 +46,11 @@ @current_version.assignable_p_pretty@ - + - + @@ -76,8 +76,8 @@ #bug-tracker.Planned_Release# #bug-tracker.Maintainer# #bug-tracker.Assign# -#acs-kernel.common_Edit# -#acs-kernel.common_Delete# +#acs-kernel.common_edit# +#acs-kernel.common_delete# #bug-tracker.Current# @@ -107,11 +107,11 @@ @future_version.assignable_p_pretty@ - + - + @@ -138,8 +138,8 @@ #bug-tracker.Planned_Release# #bug-tracker.Actual_Release# #bug-tracker.Maintainer# -#acs-kernel.common_Edit# -#acs-kernel.common_Delete# +#acs-kernel.common_edit# +#acs-kernel.common_delete# @@ -165,11 +165,11 @@ #bug-tracker.None# - + - +