Commit b34a38c6 authored by timeless%mozdev.org's avatar timeless%mozdev.org

Bug 365438 Tag-related error messages should mention "tag" instead of "saved search"

r=reed a=mkanat
parent 47d02944
...@@ -544,12 +544,15 @@ elsif (($cgi->param('cmdtype') eq "doit") && defined $cgi->param('remtype')) { ...@@ -544,12 +544,15 @@ elsif (($cgi->param('cmdtype') eq "doit") && defined $cgi->param('remtype')) {
$bug_ids{$bug_id} = $keep_bug; $bug_ids{$bug_id} = $keep_bug;
$changes = 1; $changes = 1;
} }
ThrowUserError('no_bug_ids', {'action' => $action}) unless $changes; ThrowUserError('no_bug_ids',
{'action' => $action,
'tag' => $query_name})
unless $changes;
# Only keep bug IDs we want to add/keep. Disregard deleted ones. # Only keep bug IDs we want to add/keep. Disregard deleted ones.
my @bug_ids = grep { $bug_ids{$_} == 1 } keys %bug_ids; my @bug_ids = grep { $bug_ids{$_} == 1 } keys %bug_ids;
# If the list is now empty, we could as well delete it completely. # If the list is now empty, we could as well delete it completely.
ThrowUserError('no_bugs_in_list', {'saved_search' => $query_name}) ThrowUserError('no_bugs_in_list', {'tag' => $query_name})
unless scalar(@bug_ids); unless scalar(@bug_ids);
$new_query = "bug_id=" . join(',', sort {$a <=> $b} @bug_ids); $new_query = "bug_id=" . join(',', sort {$a <=> $b} @bug_ids);
......
...@@ -902,10 +902,6 @@ ...@@ -902,10 +902,6 @@
The name of a milestone is limited to 20 characters. The name of a milestone is limited to 20 characters.
'[% name FILTER html %]' is too long ([% name.length %] characters). '[% name FILTER html %]' is too long ([% name.length %] characters).
[% ELSIF error == "milestone_not_specified" %]
[% title = "No Milestone Specified" %]
No milestone specified when trying to edit milestones.
[% ELSIF error == "milestone_not_valid" %] [% ELSIF error == "milestone_not_valid" %]
[% title = "Specified Milestone Does Not Exist" %] [% title = "Specified Milestone Does Not Exist" %]
The milestone '[% milestone FILTER html %]' for product The milestone '[% milestone FILTER html %]' for product
...@@ -1044,26 +1040,25 @@ ...@@ -1044,26 +1040,25 @@
You didn't define any axes to plot. You didn't define any axes to plot.
[% ELSIF error == "no_bugs_chosen" %] [% ELSIF error == "no_bugs_chosen" %]
[% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %] [% title = BLOCK %]No [% terms.Bugs %] Selected[% END %]
You apparently didn't choose any [% terms.bugs %] to modify. You apparently didn't choose any [% terms.bugs %] to modify.
[% ELSIF error == "no_bug_ids" %] [% ELSIF error == "no_bug_ids" %]
[% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %] [% title = BLOCK %]No [% terms.Bugs %] Selected[% END %]
You didn't choose any [% terms.bugs %] to You didn't choose any [% terms.bugs %] to
[% IF action == "add" %] add to [% ELSE %] remove from [% END %] [% IF action == "add" %] add to [% ELSE %] remove from [% END %]
the saved search. the [% tag FILTER html %] tag.
[% ELSIF error == "no_bugs_in_list" %] [% ELSIF error == "no_bugs_in_list" %]
[% title = "Delete Saved Search?" %] [% title = "Delete Tag?" %]
You are going to remove all [% terms.bugs %] from the '[% saved_search FILTER html %]' This will remove all [% terms.bugs %] from the
saved search. This will delete this saved search completely. Click [% tag FILTER html %] tag. This will delete the tag completely. Click
<a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd= <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
[%- saved_search FILTER url_quote %]">here</a> if you really want to [%- tag FILTER url_quote %]">here</a> if you really want to delete it.
remove it.
[% ELSIF error == "no_bugs_to_remove" %] [% ELSIF error == "no_bugs_to_remove" %]
[% title = "No Saved Search Selected" %] [% title = "No Tag Selected" %]
You didn't select any saved search to remove [% terms.bugs %] from. You didn't select a tag from which to remove [% terms.bugs %].
[% ELSIF error == "no_component_change_for_multiple_products" %] [% ELSIF error == "no_component_change_for_multiple_products" %]
[% title = "Action Not Permitted" %] [% title = "Action Not Permitted" %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment