From 719303d9928bf0a727478c32f83a39b015a25136 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Thu, 9 Apr 2009 11:37:56 +0000 Subject: Bug 454251: Implement Bugzilla::Attachment->create() and $attachment->update() - Patch by Frédéric Buclin a=LpSolit (module owner) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/global/code-error.html.tmpl | 8 ++++++++ template/en/default/global/user-error.html.tmpl | 13 +++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'template/en/default/global') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 9d182d25f..a2863336a 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -47,6 +47,14 @@ Attachment #[% attach_id FILTER html %] ([% description FILTER html %]) is already obsolete. + [% ELSIF error == "attachment_local_storage_disabled" %] + [% title = "Local Storage Disabled" %] + You cannot store attachments locally. This feature is disabled. + + [% ELSIF error == "attachment_url_disabled" %] + [% title = "Attachment URL Disabled" %] + You cannot attach a URL. This feature is currently disabled. + [% ELSIF error == "auth_invalid_email" %] [% title = "Invalid Email Address" %] We received an email address ([% addr FILTER html %]) diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 338088178..879e62ade 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -211,6 +211,11 @@ [% title = "Attachment Deletion Disabled" %] Attachment deletion is disabled on this installation. + [% ELSIF error == "attachment_illegal_url" %] + [% title = "Illegal Attachment URL" %] + [% url FILTER html %] is not a legal URL for attachments. + It must start either with http://, https:// or ftp://. + [% ELSIF error == "attachment_removed" %] [% title = "Attachment Removed" %] The attachment you are attempting to access has been removed. @@ -875,8 +880,7 @@ [% 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. + is one of [% constants.LEGAL_CONTENT_TYPES.join(', ') FILTER html %]. [% ELSIF error == "invalid_context" %] [% title = "Invalid Context" %] @@ -1615,6 +1619,11 @@ [% name FILTER html %] does not exist or you are not allowed to see that user. + [% ELSIF error == "user_not_insider" %] + [% title = "User Not In Insidergroup" %] + Sorry, but you are not allowed to (un)mark comments or attachments + as private. + [% ELSIF error == "votes_must_be_nonnegative" %] [% title = "Votes Must Be Non-negative" %] [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %] -- cgit v1.2.3-24-g4f1b