diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/admin/params/bugmove.html.tmpl | 49 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/bug/format_comment.txt.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/field-descs.none.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 9 | ||||
| -rw-r--r-- | template/en/default/list/edit-multiple.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/pages/fields.html.tmpl | 12 |
8 files changed, 4 insertions, 89 deletions
diff --git a/template/en/default/admin/params/bugmove.html.tmpl b/template/en/default/admin/params/bugmove.html.tmpl deleted file mode 100644 index 911bc330a..000000000 --- a/template/en/default/admin/params/bugmove.html.tmpl +++ /dev/null @@ -1,49 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Dave Miller <justdave@bugzilla.org> - # Frédéric Buclin <LpSolit@gmail.com> - #%] -[% - title = "$terms.Bug Moving" - desc = "Set up parameters to move $terms.bugs to/from another installation" -%] - -[% param_descs = { - "move-enabled" => "If this is on, $terms.Bugzilla will allow certain people " _ - "to move $terms.bugs to the defined database.", - - "move-button-text" => "The text written on the Move button. Explain where the $terms.bug is " _ - "being moved to.", - - "move-to-url" => "The URL of the database we allow some of our $terms.bugs to be moved to.", - - "move-to-address" => "To move ${terms.bugs}, an email is sent to the target database. This is " _ - "the email address that database uses to listen for incoming ${terms.bugs}.", - - "moved-from-address" => "To move ${terms.bugs}, an email is sent to the target database. This is " _ - "the email address from which this mail, and error messages are sent.", - - movers => "A list of people with permission to move $terms.bugs and reopen moved " _ - "${terms.bugs} (in case the move operation fails).", - - "moved-default-product" => "$terms.Bugs moved from other databases to here are assigned " _ - "to this product.", - - "moved-default-component" => "$terms.Bugs moved from other databases to here are assigned " _ - "to this component." } -%] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index e3255ec1e..d9342a93c 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -1133,9 +1133,6 @@ <div class="knob-buttons"> <input type="submit" value="Save Changes" id="commit[% id FILTER css_class_quote %]"> - [% IF bug.user.canmove %] - <input type="submit" name="action" id="action[% id FILTER css_class_quote %]" value="[% Param("move-button-text") %]"> - [% END %] </div> [% END %] [% END %] diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 7a65aed24..ed89188a6 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -39,14 +39,6 @@ X[% comment_body %] *** This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%+ comment.extra_data %] *** [% ELSIF comment.type == constants.CMT_HAS_DUPE %] *** [% terms.Bug %] [%+ comment.extra_data %] has been marked as a duplicate of this [% terms.bug %]. *** -[% ELSIF comment.type == constants.CMT_MOVED_TO %] -X[% comment_body %] - -[%+ terms.Bug %] moved to [% Param("move-to-url") %]. -If the move succeeded, [% comment.extra_data %] will receive a mail containing -the number of the new [% terms.bug %] in the other database. -If all went well, please paste in a link to the new [% terms.bug %]. -Otherwise, reopen this [% terms.bug %]. [% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %] Created attachment [% comment.extra_data %] [% IF is_bugmail %] diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index f36199bef..177d47621 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -349,10 +349,6 @@ [% ELSIF error == "need_quipid" %] A valid quipid is needed. - [% ELSIF error == "no_manual_moved" %] - You cannot set the resolution of [% terms.abug %] to [% display_value("resolution", "MOVED") FILTER html %] without - moving the [% terms.bug %]. - [% ELSIF error == "object_dep_sort_loop" %] There is a loop in VALIDATOR_DEPENDENCIES involving '[%+ field FILTER html %]'. Here are the fields we considered: diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index bbe1aba7b..6b406431e 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -73,8 +73,8 @@ "resolution" => { "" => "---", - # "FIXED" => "NO LONGER AN ISSUE", - # "MOVED" => "BYE-BYE", + # "FIXED" => "NO LONGER AN ISSUE", + # "WORKSFORME" => "NOTMYPROBLEM!", }, } %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 669d6adb3..0d053cb74 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -145,8 +145,6 @@ delete [% ELSIF action == "edit" %] add, modify or delete - [% ELSIF action == "move" %] - move [% ELSIF action == "run" %] run [% ELSIF action == "schedule" %] @@ -155,6 +153,8 @@ use [% ELSIF action == "approve" %] approve + [% ELSE %] + [% Hook.process('auth_failure_action') %] [% END %] [% IF object == "administrative_pages" %] @@ -1164,11 +1164,6 @@ A valid resolution is required to mark [% terms.bugs %] as [%+ status FILTER upper FILTER html %]. - [% ELSIF error == "move_bugs_disabled" %] - [% title = BLOCK %][% terms.Bug %] Moving Disabled[% END %] - Sorry, [% terms.bug %] moving has been disabled. If you need - to move [% terms.abug %], please contact [% Param("maintainer") %]. - [% ELSIF error == "missing_subcategory" %] [% title = "Missing Subcategory" %] You did not specify a subcategory for this series. diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 5f16dae69..c6bfbd336 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -353,10 +353,6 @@ [% END %] <input type="submit" id="commit" value="Commit"> -[% IF Param('move-enabled') && user.is_mover %] - <input type="submit" name="action" id="action" value="[% Param('move-button-text') %]"> -[% END %] - [%############################################################################%] [%# Select Menu Block #%] [%############################################################################%] diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index b3583b568..de089ec11 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -203,18 +203,6 @@ behavior would occur. If more information appears later, the [% terms.bug %] can be reopened. </dd> - - [% IF Param('move-enabled') %] - <dt> - [% display_value("resolution", "MOVED") FILTER html %] - </dt> - <dd> - The problem was specific to a related product - whose [% terms.bugs %] are tracked in - another [% terms.bug %] database. - The [% terms.bug %] has been moved to that database. - </dd> - [% END %] </dl> </td> </tr> |