summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-05-01 05:52:20 +0200
committerlpsolit%gmail.com <>2006-05-01 05:52:20 +0200
commit640fb0493cf354df374b8fda5f24bab9110eb64a (patch)
tree0317f8d21134cbc1c0712b7f35bae83e97eca218
parent9a6a605de0bda2424faadce6d9210d42b7519865 (diff)
downloadbugzilla-640fb0493cf354df374b8fda5f24bab9110eb64a.tar.gz
bugzilla-640fb0493cf354df374b8fda5f24bab9110eb64a.tar.xz
Bug 331008: Consistently name errors either prod_ or product_ - Patch by timeless <timeless@bemail.org> r=LpSolit a=justdave
-rwxr-xr-xeditproducts.cgi18
-rw-r--r--template/en/default/global/user-error.html.tmpl16
2 files changed, 17 insertions, 17 deletions
diff --git a/editproducts.cgi b/editproducts.cgi
index 794caf158..9123f034f 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -168,13 +168,13 @@ if ($action eq 'new') {
# Check for exact case sensitive match:
if ($product->name eq $product_name) {
- ThrowUserError("prod_name_already_in_use",
+ ThrowUserError("product_name_already_in_use",
{'product' => $product->name});
}
# Next check for a case-insensitive match:
if (lc($product->name) eq lc($product_name)) {
- ThrowUserError("prod_name_diff_in_case",
+ ThrowUserError("product_name_diff_in_case",
{'product' => $product_name,
'existing_product' => $product->name});
}
@@ -779,30 +779,30 @@ if ($action eq 'update') {
}
unless ($product_name) {
- ThrowUserError('prod_cant_delete_name',
+ ThrowUserError('product_cant_delete_name',
{product => $product_old->name});
}
unless ($description) {
- ThrowUserError('prod_cant_delete_description',
+ ThrowUserError('product_cant_delete_description',
{product => $product_old->name});
}
my $stored_maxvotesperbug = $maxvotesperbug;
if (!detaint_natural($maxvotesperbug)) {
- ThrowUserError('prod_votes_per_bug_must_be_nonnegative',
+ ThrowUserError('product_votes_per_bug_must_be_nonnegative',
{maxvotesperbug => $stored_maxvotesperbug});
}
my $stored_votesperuser = $votesperuser;
if (!detaint_natural($votesperuser)) {
- ThrowUserError('prod_votes_per_user_must_be_nonnegative',
+ ThrowUserError('product_votes_per_user_must_be_nonnegative',
{votesperuser => $stored_votesperuser});
}
my $stored_votestoconfirm = $votestoconfirm;
if (!detaint_natural($votestoconfirm)) {
- ThrowUserError('prod_votes_to_confirm_must_be_nonnegative',
+ ThrowUserError('product_votes_to_confirm_must_be_nonnegative',
{votestoconfirm => $stored_votestoconfirm});
}
@@ -812,7 +812,7 @@ if ($action eq 'update') {
new Bugzilla::Product({name => $product_name});
if (lc($product_name) ne lc($product_old->name) &&
$testproduct) {
- ThrowUserError('prod_name_already_in_use',
+ ThrowUserError('product_name_already_in_use',
{product => $product_name});
}
@@ -822,7 +822,7 @@ if ($action eq 'update') {
$defaultmilestone);
unless ($milestone) {
- ThrowUserError('prod_must_define_defaultmilestone',
+ ThrowUserError('product_must_define_defaultmilestone',
{product => $product_old->name,
defaultmilestone => $defaultmilestone,
classification => $classification_name});
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c50955db8..db3bb682f 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1037,50 +1037,50 @@
Patches cannot be more than [% Param('maxpatchsize') %] KB in size.
Try breaking your patch into several pieces.
- [% ELSIF error == "prod_votes_per_bug_must_be_nonnegative" %]
+ [% ELSIF error == "product_votes_per_bug_must_be_nonnegative" %]
[% title = "Maximum Votes Must Be Non-negative" %]
[% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
'[% maxvotesperbug FILTER html %]' is an invalid value for the
<em>'Maximum Votes Per [% terms.Bug %]'</em> field, which should
contain a non-negative number.
- [% ELSIF error == "prod_votes_per_user_must_be_nonnegative" %]
+ [% ELSIF error == "product_votes_per_user_must_be_nonnegative" %]
[% title = "Votes Per User Must Be Non-negative" %]
[% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
'[% votesperuser FILTER html %]' is an invalid value for the
<em>'Votes Per User'</em> field, which should contain a
non-negative number.
- [% ELSIF error == "prod_votes_to_confirm_must_be_nonnegative" %]
+ [% ELSIF error == "product_votes_to_confirm_must_be_nonnegative" %]
[% title = "Votes To Confirm Must Be Non-negative" %]
[% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
'[% votestoconfirm FILTER html %]' is an invalid value for the
<em>'Votes To Confirm'</em> field, which should contain a
non-negative number.
- [% ELSIF error == "prod_cant_delete_description" %]
+ [% ELSIF error == "product_cant_delete_description" %]
[% title = "Cannot delete product description" %]
[% admindocslinks = {'products.html' => 'Administering products'} %]
Cannot delete the description for product
'[% product FILTER html %]'.
- [% ELSIF error == "prod_cant_delete_name" %]
+ [% ELSIF error == "product_cant_delete_name" %]
[% title = "Cannot delete product name" %]
[% admindocslinks = {'products.html' => 'Administering products'} %]
Cannot delete the product name for product '[% product FILTER html %]'.
- [% ELSIF error == "prod_name_already_in_use" %]
+ [% ELSIF error == "product_name_already_in_use" %]
[% title = "Product name already in use" %]
[% admindocslinks = {'products.html' => 'Administering products'} %]
The product name '[% product FILTER html %]' is already in use.
- [% ELSIF error == "prod_name_diff_in_case" %]
+ [% ELSIF error == "product_name_diff_in_case" %]
[% title = "Product name differs only in case" %]
[% admindocslinks = {'products.html' => 'Administering products'} %]
The product name '[% product FILTER html %]' differs from existing
product '[% existing_product FILTER html %]' only in case.
- [% ELSIF error == "prod_must_define_defaultmilestone" %]
+ [% ELSIF error == "product_must_define_defaultmilestone" %]
[% title = "Must define new default milestone" %]
[% admindocslinks = {'products.html' => 'Administering products',
'milestones.html' => 'About Milestones'} %]