From 99bec2e52b174c1e8774ebf12da5963330d47af9 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 11 Aug 2015 23:16:38 +0800 Subject: Bug 1160929 - add support for storing attachments in s3 --- template/en/default/global/code-error.html.tmpl | 8 ++++++++ template/en/default/global/user-error.html.tmpl | 4 ++++ template/en/default/setup/strings.txt.pl | 1 + 3 files changed, 13 insertions(+) (limited to 'template') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 672c8b29d..40b59801c 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -415,6 +415,14 @@ [%+ ELSIF fld == "z" %]the multiple tables/images [%+ ELSE %]a report axis[% END %] field. + [% ELSIF error == "s3_add_failed" %] + Failed to add attachment ID [% attach_id FILTER html %] to S3: + [%+ reason FILTER html %] + + [% ELSIF error == "s3_get_failed" %] + Failed to fetch attachment ID [% attach_id FILTER html %] from S3: + [%+ reason FILTER html %] + [% ELSIF error == "search_cp_without_op" %] Search argument f[% id FILTER html %] is "CP" but there is no matching "OP" before it. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index e8510b134..4de3845d4 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1071,6 +1071,10 @@ [% title = "Invalid Parameter" %] The new value for [% name FILTER html %] is invalid: [% err FILTER html %]. + [% ELSIF error == "invalid_parameters" %] + [% title = "Invalid Parameters" %] + Invalid parameters: [% err FILTER html %]. + [% ELSIF error == "invalid_product_name" %] [% title = "Invalid Product Name" %] The product name '[% product FILTER html %]' is invalid or does not exist. diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index ef45dcc16..aab9b11f5 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -109,6 +109,7 @@ END feature_moving => 'Move Bugs Between Installations', feature_patch_viewer => 'Patch Viewer', feature_rest => 'REST Interface', + feature_s3 => 'Attachment S3 Storage', feature_smtp_auth => 'SMTP Authentication', feature_updates => 'Automatic Update Notifications', feature_xmlrpc => 'XML-RPC Interface', -- cgit v1.2.3-24-g4f1b