From 4e7e3310242bd5264b5f48e4bf3c387e59288b85 Mon Sep 17 00:00:00 2001
From: "bbaetz%acm.org" <>
Date: Sun, 14 Sep 2003 13:04:38 +0000
Subject: Bug 208699 - Move Throw{Code,Template}Error into Error.pm
r,a=justdave
---
template/en/default/global/code-error.html.tmpl | 53 +++++++++++--------------
1 file changed, 24 insertions(+), 29 deletions(-)
(limited to 'template/en')
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 939c0c4dc..73501672b 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -39,7 +39,7 @@
[% error_message = BLOCK %]
[% IF error == "action_unrecognized" %]
- I don't recognize the value ([% variables.action FILTER html %])
+ I don't recognize the value ([% action FILTER html %])
of the action variable.
[% ELSIF error == "attachment_already_obsolete" %]
@@ -85,9 +85,6 @@
Charts will not work without the GD Perl module being installed.
Run checksetup.pl for installation instructions.
- [% ELSIF error == "group_bit_invalid" %]
- One of the group bits submitted was invalid.
-
[% ELSIF error == "illegal_content_type_method" %]
Your form submission got corrupted somehow. The content
method field, which specifies how the content type gets determined,
@@ -142,27 +139,31 @@
[% terms.bug %] [%+ my_bug_id FILTER html %].
[% ELSIF error == "flag_nonexistent" %]
- There is no flag with ID #[% variables.id FILTER html %].
+ There is no flag with ID #[% id FILTER html %].
[% ELSIF error == "flag_status_invalid" %]
- The flag status [% variables.status FILTER html %] is invalid.
+ The flag status [% status FILTER html %]
+ [% IF id %]
+ for flag ID #[% id FILTER html %]
+ [% END %]
+ is invalid.
[% ELSIF error == "flag_type_component_nonexistent" %]
- The component [% variables.component FILTER html %] does not exist
- in the product [% variables.product FILTER html %].
+ The component [% component FILTER html %] does not exist
+ in the product [% product FILTER html %].
[% ELSIF error == "flag_type_component_without_product" %]
A component was selected without a product being selected.
[% ELSIF error == "flag_type_id_invalid" %]
- The flag type ID [% variables.id FILTER html %] is not
+ The flag type ID [% id FILTER html %] is not
a positive integer.
[% ELSIF error == "flag_type_nonexistent" %]
- There is no flag type with the ID [% variables.id FILTER html %].
+ There is no flag type with the ID [% id FILTER html %].
[% ELSIF error == "flag_type_product_nonexistent" %]
- The product [% variables.product FILTER html %] does not exist.
+ The product [% product FILTER html %] does not exist.
[% ELSIF error == "flag_type_target_type_invalid" %]
The target type was neither [% terms.bug %] nor attachment
@@ -171,10 +172,6 @@
[% ELSIF error == "invalid_field_name" %]
Can't use [% field FILTER html %] as a field name.
- [% ELSIF error == "invalid_output_type" %]
- [% title = "Invalid Output Type" %]
- Invalid output type [% type FILTER html %].
-
[% ELSIF error == "missing_bug_id" %]
No [% terms.bug %] ID was given.
@@ -195,10 +192,10 @@
The group field [% group FILTER html %] is invalid.
[% ELSIF error == "report_axis_invalid" %]
- [% variables.val FILTER html %] is not a valid value for
- [%+ IF variables.fld == "x" %]the horizontal axis
- [%+ ELSIF variables.fld == "y" %]the vertical axis
- [%+ ELSIF variables.fld == "z" %]the multiple tables/images
+ [% val FILTER html %] is not a valid value for
+ [%+ IF fld == "x" %]the horizontal axis
+ [%+ ELSIF fld == "y" %]the vertical axis
+ [%+ ELSIF fld == "z" %]the multiple tables/images
[%+ ELSE %]a report axis[% END %] field.
[% ELSIF error == "token_generation_error" %]
@@ -222,21 +219,19 @@
[% ELSIF error == "unknown_component" %]
[% title = "Unknown Component" %]
- There is no component named [% variables.component FILTER html %].
+ There is no component named [% component FILTER html %].
[% ELSIF error == "unknown_product" %]
[% title = "Unknown Product" %]
- There is no product named [% variables.product FILTER html %].
+ There is no product named [% product FILTER html %].
[% ELSE %]
- [%# Give sensible error if error functions are used incorrectly.
- #%]
- You are using [% terms.Bugzilla %]'s ThrowCodeError() function incorrectly.
- You passed in the string '[% error FILTER html %]'. The correct use is to
- pass in a tag, and define that tag in the file code-error.html.tmpl.
-
- If you are a [% terms.Bugzilla %] end-user seeing this message, please save this
- page and send it to [% Param('maintainer') %].
+ [% title = "Internal error" %]
+ An internal error has occured, but [% terms.Bugzilla %] doesn't know
+ what [% error FILTER html %]
means.
+
+ If you are a [% terms.Bugzilla %] end-user seeing this message, please save
+ this page and send it to [% Param('maintainer') %].
[% END %]
[% END %]
--
cgit v1.2.3-24-g4f1b