diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-07-15 22:29:01 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-07-15 22:29:01 +0200 |
| commit | cd2f1c38499004485e3a817e8835b2a0ed9266fd (patch) | |
| tree | bf2da6db834ba19593dc9409e408b8eaa30549e0 /template/en | |
| parent | fb6ef2f23aeda0ba93d97a7e0abd6a21c952fa4f (diff) | |
| download | bugzilla-cd2f1c38499004485e3a817e8835b2a0ed9266fd.tar.gz bugzilla-cd2f1c38499004485e3a817e8835b2a0ed9266fd.tar.xz | |
Bug 892601 - Port over upstream native REST patch (bug 866927) to bmo/4.2
r=glob
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/rest.html.tmpl | 19 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index d53708409..88bc7895a 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -472,6 +472,15 @@ The first letter of your extension's name must be a capital letter. (You specified '[% name FILTER html %]'.) + [% ELSIF error == "feature_disabled" %] + The [% install_string("feature_$feature") FILTER html %] feature is not + available in this [% terms.Bugzilla %]. + [% IF user.in_group('admin') %] + If you would like to enable this feature, please run + <kbd>checksetup.pl</kbd> to see how to install the necessary + requirements for this feature. + [% END %] + [% ELSIF error == "field_already_exists" %] [% title = "Field Already Exists" %] The field '[% field.name FILTER html %]' @@ -1045,6 +1054,13 @@ For security reasons, you must use HTTP POST to call the '[% method FILTER html %]' method. + [% ELSIF error == "rest_invalid_resource" %] + A REST API resource was not found for '[% method FILTER html +%] [%+ path FILTER html %]'. + + [% ELSIF error == "rest_get_products_invalid_type" %] + The type '[% type FILTER html %]' is invalid for 'GET /product'. Valid choices + are 'accessible' (default if type value is undefined), 'selectable', and 'enterable'. + [% ELSIF error == "keyword_already_exists" %] [% title = "Keyword Already Exists" %] A keyword with the name [% name FILTER html %] already exists. diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl new file mode 100644 index 000000000..0b8321dd1 --- /dev/null +++ b/template/en/default/rest.html.tmpl @@ -0,0 +1,19 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> + <head> + <title>Bugzilla::REST::API</title> + <link href="[% urlbase FILTER none %][% 'skins/standard/global.css' FILTER mtime %]" + rel="stylesheet" type="text/css"> + </head> + <body> + <pre>[% result FILTER html %]</pre> + </body> +</html> diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index c96fc014e..837c95d18 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -105,6 +105,7 @@ END feature_mod_perl => 'mod_perl', feature_moving => 'Move Bugs Between Installations', feature_patch_viewer => 'Patch Viewer', + feature_rest => 'REST Interface', feature_smtp_auth => 'SMTP Authentication', feature_updates => 'Automatic Update Notifications', feature_xmlrpc => 'XML-RPC Interface', |