diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-02-24 22:39:29 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-02-24 22:39:29 +0100 |
| commit | 4098cc8be26a268bf561ff80f981a93c6959c678 (patch) | |
| tree | 87940ec25918eb7505a3d7a495286867c72bf74c /template/en/default | |
| parent | bf7f26d66089402df37036d1e62a6d8711922da1 (diff) | |
| parent | 11fef47a1847cdfc5671dfc41447e893ed0037a5 (diff) | |
| download | bugzilla-4098cc8be26a268bf561ff80f981a93c6959c678.tar.gz bugzilla-4098cc8be26a268bf561ff80f981a93c6959c678.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/whine/mail.html.tmpl | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index acdb11381..6d95850dd 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1738,6 +1738,11 @@ <[% type FILTER html %]> field. (See the XML-RPC specification for details.) + [% ELSIF error == "xmlrpc_illegal_content_type" %] + When using XML-RPC, you cannot send data as + [%+ content_type FILTER html %]. Only text/xml + and application/xml are allowed. + [% ELSIF error == "zero_length_file" %] [% title = "File Is Empty" %] The file you are trying to attach is empty, does not exist, or you don't diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index ae4f00cfc..a7bff5038 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -40,9 +40,9 @@ </head> <body bgcolor="#FFFFFF"> - <p align="left"> + <pre> [% body FILTER html %] - </p> + </pre> <p align="left"> [% IF author.login == recipient.login %] |