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.3 -r1.4 --- openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml 20 Apr 2004 14:19:34 -0000 1.3 +++ openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml 20 Apr 2004 15:45:24 -0000 1.4 @@ -2,6 +2,7 @@ Accepted + Accept Open freeze release @@ -34,7 +35,9 @@ bug info *Bug Bug Number - Bug status: [ %open_filter;noquote% ] + Bug #%bug_number% not found. + #%bug_number% - %bug_name% + Bug status: [ %open_filter% ] Suggestion Bug Type Bug Tracker @@ -55,8 +58,7 @@ component Component_id %component_id% not found components - Components: %component_filter;noquote% - could not be found + Components: %component_filter% Create new Create new category type Creation Date @@ -85,7 +87,7 @@ Fix for Version Fixed in version - Fixed by <a href=\"patch?patch_number=%patch_number%\">patch \#%patch_number%</a> + Fixed by <a href="patch?patch_number=%patch_number%">patch #%patch_number%</a> Fixed in Version in version Found in Version @@ -110,8 +112,8 @@ Maintainer Manage Categories Manage your notifications - to %bugs_name% - Patch #%patch_number% \"%patch_summary%\" to a Bug + map to %bugs_name% + Map patch #%patch_number% "%patch_summary%" to a Bug Name in shortcut URL Need_Info New @@ -123,28 +125,29 @@ No Maintainer %next_bug_num% of %all_bugs% No %patches_name%. - You don't have permission to '%action.pretty_name%' on bug #%bug_id% (\"%bug.summary%\"). + You don't have permission to '%action.pretty_name%' on bug #%bug_id% "%bug.summary%" Couldn't find user in database None You're not logged in. For more options, <a href="%login_url%">log in now</a>. Not Reproducable tag Notifications Notifications for - No of %pretty_names.bugs% + Total # - %Component_name% \"%component_name%\" - %Component_name% \"%component_name%\" + %Component_name% "%component_name%" + %Component_name% "%component_name%" Open Bugs Open Opened Page with [ %pagination_filter% ] &nbsp; &nbsp; Show Parameters + %patch_pretty_name% %patch_action_pretty_mode% by %bt_user_first_names% %bt_user_last_name% file - \# + # file (leave blank to keep current file): - \#%patch_number% - \# %patch_number%: %patch.summary% + #%patch_number% + Patch #%patch_number%: %patch_summary% Denied Permission Denied Permissions @@ -164,6 +167,7 @@ Project administration Reassign Refused + Refuse Release Version Release this version Index: openacs-4/packages/bug-tracker/tcl/bug-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/bug-tracker/tcl/bug-procs.tcl 20 Apr 2004 14:19:35 -0000 1.16 +++ openacs-4/packages/bug-tracker/tcl/bug-procs.tcl 20 Apr 2004 15:45:24 -0000 1.17 @@ -685,14 +685,14 @@ set elements { bug_number { - label "[bug_tracker::conn Bug] [_ bug-tracker.number_symbol] " + label "[bug_tracker::conn Bug] [_ bug-tracker.number_symbol]" display_template {[_ bug-tracker.number_symbol]@bugs.bug_number@} html { align right } } summary { label "[_ bug-tracker.Summary]" link_url_eval {[export_vars -base bug -entire_form -override { bug_number }]} - aggregate_label "[_ bug-tracker.Number]" + aggregate_label {[_ bug-tracker.Number]} } comment { label "[_ bug-tracker.Details]" 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.29 -r1.30 --- openacs-4/packages/bug-tracker/www/bug.tcl 20 Apr 2004 14:19:35 -0000 1.29 +++ openacs-4/packages/bug-tracker/www/bug.tcl 20 Apr 2004 15:45:24 -0000 1.30 @@ -9,6 +9,7 @@ {user_agent_p:boolean 0} {show_patch_status open} }] +set pretty_names_bugs Fooooooooooooo ##### # @@ -25,8 +26,8 @@ set user_id [ad_conn user_id] permission::require_permission -object_id $package_id -privilege read -set Bug_name [bug_tracker::conn Bug] -set page_title "[_ bug-tracker.%Bug_name% %bug_number%]" +set bug_name [bug_tracker::conn Bug] +set page_title [_ bug-tracker.Bug_Title] set context [list [ad_quotehtml $page_title]] @@ -45,10 +46,8 @@ # Get the bug_id if { ![db_0or1row permission_info {} -column_array bug] } { - set Bug_name [bug_tracker::conn Bug] - set could_not_be_found [_ bug-tracker.Could_not_find] - ad_return_complaint 1 "[_ bug-tracker.%Bug_name% %bug_number% %could_not_be_found%]" - return + ad_return_complaint 1 [_ bug-tracker.Bug_not_found] + ad_script_abort } set case_id [workflow::case::get_id \ @@ -320,7 +319,8 @@ # check that the element exists if { [info exists bug:$element] && [info exists bug($element)] } { - if { [form is_request bug] || [string equal [element get_property bug $element mode] "[_ acs-kernel.common_display]" } { + if { [form is_request bug] \ + || [string equal [element get_property bug $element mode] [_ acs-kernel.common_display]] } { element set_value bug $element $bug($element) } } Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 29 Mar 2004 15:07:34 -0000 1.6 +++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 20 Apr 2004 15:45:24 -0000 1.7 @@ -68,7 +68,7 @@ set component_name [bug_tracker::component_get_name -component_id $component_id] set component_filter_url "map-patch-to-bugs?[export_vars -url {patch_number component_id return_url offset show_only_open_p interval_size}]" if { $show_all_components_p } { - set component_filter "\[ [_ bug-tracker.Only]" | [_ bug-tracker.All_1] \]" + set component_filter "\[ [_ bug-tracker.Only] | [_ bug-tracker.All_1] \]" } else { set component_where_clause "\n and bt_bugs.component_id = :component_id" 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.10 -r1.11 --- openacs-4/packages/bug-tracker/www/patch.tcl 20 Apr 2004 14:19:35 -0000 1.10 +++ openacs-4/packages/bug-tracker/www/patch.tcl 20 Apr 2004 15:45:24 -0000 1.11 @@ -337,21 +337,22 @@ element set_properties patch description -value $action_html } else { - set patch_pretty_name "$patch(now_pretty)" + set patch_pretty_name $patch(now_pretty) set patch_action_pretty_mode [bug_tracker::patch_action_pretty $mode] set bt_user_first_names [bug_tracker::conn user_first_names] set bt_user_last_name [bug_tracker::conn user_last_name] element set_properties patch description \ - -history $action_html \ - -header "[_ bug-tracker.%patch_pretty_name% %patch_action_pretty_mode% by %bt_user_first_names% %bt_user_last_name%]" \ - -value "" - } - + -history $action_html \ + -header [_ bug-tracker.Patch_Header ] \ + -value "" + } + # Now that we have the patch summary we can make the page title more informative set Patch_name [bug_tracker::conn Patch] - set page_title "[_ bug-tracker.Patch_4]" + set patch_summary $patch(summary) + set page_title [_ bug-tracker.Patch_Page_Title] # Create the buttons # If the user has submitted the patch he gets full write access on the patch