From a29e0e0640faad00f8c1bf792b93260047f16956 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Sat, 21 Sep 2002 05:26:11 +0000
Subject: Bug 163114 - Templatise all calls to DisplayError. First patch -
attachment.cgi. Patch by gerv; r=burnus.
---
template/en/default/global/code-error.html.tmpl | 21 +++++++++
template/en/default/global/user-error.html.tmpl | 58 +++++++++++++++++++++++++
2 files changed, 79 insertions(+)
(limited to 'template/en/default')
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index a74d014cd..55fac2aca 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -40,6 +40,10 @@
to any [% parameters %] which you may have set before calling
ThrowCodeError.
+ [% ELSIF error == "attachment_already_obsolete" %]
+ Attachment #[% attachid FILTER html %] ([% description FILTER html %])
+ is already obsolete.
+
[% ELSIF error == "field_type_mismatch" %]
Cannot seem to handle [% field %]
and [% type %]
together.
@@ -47,6 +51,13 @@
[% 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,
+ should have been either autodetect, list,
+ or manual, but was instead
+ [% contenttypemethod FILTER html %].
+
[% ELSIF error == "illegal_field" %]
A legal [% field FILTER html %] was not set.
@@ -54,6 +65,16 @@
Attempted to add bug to an inactive group, identified by the bit
'[% bit FILTER html %]'.
+ [% ELSIF error == "invalid_attach_id_to_obsolete" %]
+ The attachment number of one of the attachments you wanted to obsolete,
+ [% attach_id FILTER html %], is invalid.
+
+ [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
+ Attachment [% attach_id FILTER html %] ([% description FILTER html %])
+ is attached to bug [% attach_bug_id FILTER html %], but you tried to
+ flag it as obsolete while creating a new attachment to bug
+ [% my_bug_id FILTER html %].
+
[% ELSIF error == "no_bug_data" %]
No data when fetching bug [% bug_id %].
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6c0b37021..c6f970df3 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -116,11 +116,28 @@
really make sense to mark a bug as a duplicate of itself,
does it?
+ [% ELSIF error == "file_not_specified" %]
+ [% title = "No File Specified" %]
+ You did not specify a file to attach.
+
+ [% ELSIF error == "file_too_large" %]
+ [% title = "File Too Large" %]
+ The file you are trying to attach is [% filesize %] kilobytes (KB) in size.
+ Non-patch attachments cannot be more than [% Param('maxattachmentsize') %]
+ KB.
+ If your attachment is an image, try converting it to a compressable
+ format like JPG or PNG, or put it elsewhere on the web and
+ link to it from the bug's URL field or in a comment on the bug.
+
[% ELSIF error == "illegal_at_least_x_votes" %]
[% title = "Your Query Makes No Sense" %]
The At least ___ votes field must be a simple number.
You entered [% value FILTER html %], which isn't.
+ [% ELSIF error == "illegal_attachment_edit" %]
+ [% title = "Unauthorised Action" %]
+ You are not authorised to edit attachment [% attach_id %].
+
[% ELSIF error == "illegal_attachment_is_patch" %]
[% title = "Your Query Makes No Sense" %]
The only legal values for the Attachment is patch field are
@@ -155,6 +172,21 @@
The only legal values for the Attachment is obsolete field are
0 and 1.
+ [% ELSIF error == "invalid_attach_id" %]
+ [% title = "Invalid Attachment ID" %]
+ The attachment id [% attach_id FILTER html %] is invalid.
+
+ [% ELSIF error == "invalid_attach_status" %]
+ [% title = "Invalid Attachment Status" %]
+ One of the statuses you entered is not a valid status for this attachment.
+
+ [% ELSIF error == "invalid_content_type" %]
+ [% title = "Invalid Content-Type" %]
+ The content type [% contenttype FILTER html %] is invalid.
+ Valid types must be of the form foo/bar where foo
+ is either application, audio, image, message, model, multipart,
+ text, or video.
+
[% ELSIF error == "invalid_bug_id" %]
[% title = "Invalid Bug ID" %]
The bug id [% bug_id FILTER html %] is invalid.
@@ -175,6 +207,22 @@
if you are going to accept it. Part of accepting
a bug is giving an estimate of when it will be fixed.
+ [% ELSIF error == "missing_attachment_description" %]
+ [% title = "Missing Attachment Description" %]
+ You must enter a description for the attachment.
+
+ [% ELSIF error == "missing_content_type" %]
+ [% title = "Missing Content-Type" %]
+ You asked Bugzilla to auto-detect the content type, but
+ your browser did not specify a content type when uploading the file,
+ so you must enter a content type manually.
+
+ [% ELSIF error == "missing_content_type_method" %]
+ [% title = "Missing Content-Type Determination Method" %]
+ You must choose a method for determining the content type,
+ either auto-detect, select from list, or enter
+ manually.
+
[% ELSIF error == "missing_email_type" %]
[% title = "Your Query Makes No Sense" %]
You must specify one or more fields in which to search for
@@ -221,6 +269,12 @@
[% title = "No Page Specified" %]
You did not specify the id of a page to display.
+ [% ELSIF error == "patch_too_large" %]
+ [% title = "File Too Large" %]
+ The file you are trying to attach is [% filesize %] kilobytes (KB) in size.
+ Patches cannot be more than [% Param('maxpatchsize') %] KB in size.
+ Try breaking your patch into several pieces.
+
[% ELSIF error == "reassign_to_empty" %]
[% title = "Illegal Reassignment" %]
You cannot reassign to a bug to nobody. Unless you
@@ -236,6 +290,10 @@
[% title = "Unknown Tab" %]
[% current_tab_name FILTER html %]
is not a legal tab name.
+ [% ELSIF error == "zero_length_file" %]
+ [% title = "File Is Empty" %]
+ The file you are trying to attach is empty!
+
[% ELSE %]
[%# Cope with legacy calling convention, where "error" was the string
# to print.
--
cgit v1.2.1