Skip to content

bugzilla
bugzilla
Commit 0338ce8b authored by mozilla%colinogilvie.co.uk's avatar mozilla%colinogilvie.co.uk
Browse files
Options

Bug 300684: missing_version_or_component error message is not translatable

Patch by A. Karl Kornel <karl@kornel.name>, r=jouni, a=justdave
parent b5e92c54
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
globals.pl
View file @ 0338ce8b
...@@ -506,17 +506,13 @@ sub CanEnterProductOrWarn { ...@@ -506,17 +506,13 @@ sub CanEnterProductOrWarn {
trick_taint($product); trick_taint($product);
if (!defined $allow_new_bugs) { if (!defined $allow_new_bugs) {
ThrowUserError("missing_version_or_component", ThrowUserError("missing_component", { product => $product });
{ product => $product,
missing_item => 'Component' })
} elsif (!$allow_new_bugs) { } elsif (!$allow_new_bugs) {
ThrowUserError("product_disabled", { product => $product}); ThrowUserError("product_disabled", { product => $product});
} elsif ($allow_new_bugs < 0) { } elsif ($allow_new_bugs < 0) {
ThrowUserError("entry_access_denied", { product => $product}); ThrowUserError("entry_access_denied", { product => $product});
} elsif (!$has_version) { } elsif (!$has_version) {
ThrowUserError("missing_version_or_component", ThrowUserError("missing_version", { product => $product });
{ product => $product,
missing_item => 'Version' });
} }
return 1; return 1;
} }
......
template/en/default/global/user-error.html.tmpl
View file @ 0338ce8b
...@@ -752,15 +752,14 @@ ...@@ -752,15 +752,14 @@
[% title = "Missing Category" %] [% title = "Missing Category" %]
You did not specify a category for this series. You did not specify a category for this series.
[% ELSIF error == "missing_version_or_component" %] [% ELSIF error == "missing_component" %]
[% title = BLOCK %]Missing [% missing_item FILTER none %][% END %] [% title = "Missing Component" %]
Sorry; there needs to be at least one [% missing_item FILTER lower %] Sorry; there needs to be at least one component
associated with the product <em>[% product FILTER html %]</em> in order to associated with the product <em>[% product FILTER html %]</em> in order to
create a new [% terms.bug %]. create a new [% terms.bug %].
[% IF UserInGroup("editcomponents") %] [% IF UserInGroup("editcomponents") %]
<a href="edit[% missing_item FILTER lower %]s.cgi?product= <a href="editcomponents.cgi?product=[% product FILTER url_quote %]">Create
[%- product FILTER url_quote %]">Create a new a new component</a>.
[%+ missing_item FILTER lower %]</a>.
[% ELSE %] [% ELSE %]
Please contact [% Param("maintainer") %], giving the name of Please contact [% Param("maintainer") %], giving the name of
the product in which you tried to create a new [% terms.bug %]. the product in which you tried to create a new [% terms.bug %].
...@@ -814,6 +813,19 @@ ...@@ -814,6 +813,19 @@
[% title = "Missing Subcategory" %] [% title = "Missing Subcategory" %]
You did not specify a subcategory for this series. You did not specify a subcategory for this series.
[% ELSIF error == "missing_version" %]
[% title = "Missing Version" %]
Sorry; there needs to be at least one version
associated with the product <em>[% product FILTER html %]</em> in order to
create a new [% terms.bug %].
[% IF UserInGroup("editcomponents") %]
<a href="editversions.cgi?product=[% product FILTER url_quote %]">Create
a new version</a>.
[% ELSE %]
Please contact [% Param("maintainer") %], giving the name of
the product in which you tried to create a new [% terms.bug %].
[% END %]
[% ELSIF error == "need_component" %] [% ELSIF error == "need_component" %]
[% title = "Component Required" %] [% title = "Component Required" %]
You must specify a component to help determine the new assignee of these You must specify a component to help determine the new assignee of these
......
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