summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-31 17:25:07 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-31 17:25:07 +0100
commit0e5047a0f59e50741efaada8b3d13e9a86178bea (patch)
tree89899a40a2db1dead0356e791e85c26e03292b42 /template/en
parentf595c7e8156343c75b64516d73f58d8e7e50e02d (diff)
parent0b14241a7c307a2619cb67cee42086b30fa03795 (diff)
downloadbugzilla-0e5047a0f59e50741efaada8b3d13e9a86178bea.tar.gz
bugzilla-0e5047a0f59e50741efaada8b3d13e9a86178bea.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/global/code-error.html.tmpl3
-rw-r--r--template/en/default/global/user-error.html.tmpl10
2 files changed, 8 insertions, 5 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 5dce16976..f100df994 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -48,8 +48,7 @@
[% ELSE %]
[%+ Param('emailregexpdesc') FILTER html_light %]
[% END %]
- It must also not contain any of these special characters:
- <tt>\ ( ) &amp; &lt; &gt; , ; : &quot; [ ]</tt>, or any whitespace.
+ It also must not contain any illegal characters.
[% ELSIF error == "authres_unhandled" %]
The result value of [% value FILTER html %] was not handled by
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6521150bc..6a37d07e2 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -851,9 +851,8 @@
[% ELSE %]
[%+ Param('emailregexpdesc') FILTER html_light %]
[% END %]
- It must also not contain any of these special characters:
- <tt>\ ( ) &amp; &lt; &gt; , ; : &quot; [ ]</tt>, or any whitespace.
-
+ It also must not contain any illegal characters.
+
[% ELSIF error == "illegal_frequency" %]
[% title = "Too Frequent" %]
Unless you are an administrator, you may not create series which are
@@ -1019,6 +1018,11 @@
parameter. See the documentation at
[%+ docs_urlbase FILTER html %]api/Bugzilla/WebService/Server/JSONRPC.html
+ [% ELSIF error == "json_rpc_illegal_content_type" %]
+ When using JSON-RPC over POST, you cannot send data as
+ [%+ content_type FILTER html %]. Only application/json and
+ application/json-rpc are allowed.
+
[% ELSIF error == "json_rpc_invalid_params" %]
Could not parse the 'params' argument as valid JSON.
Error: [% err_msg FILTER html %]