From ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189 Mon Sep 17 00:00:00 2001 From: Dexter Morgan Date: Wed, 20 Feb 2013 16:07:49 +0000 Subject: Add 4.0 branch --- template/en/default/global/code-error.html.tmpl | 63 ++--- template/en/default/global/common-links.html.tmpl | 5 +- .../en/default/global/confirm-action.html.tmpl | 1 + .../en/default/global/confirm-user-match.html.tmpl | 7 +- template/en/default/global/field-descs.none.tmpl | 13 +- template/en/default/global/footer.html.tmpl | 6 +- template/en/default/global/header.html.tmpl | 240 +++++++++--------- template/en/default/global/help.html.tmpl | 5 +- template/en/default/global/hidden-fields.html.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 25 +- .../en/default/global/per-bug-queries.html.tmpl | 1 + template/en/default/global/reason-descs.none.tmpl | 40 +++ template/en/default/global/setting-descs.none.tmpl | 3 + .../en/default/global/site-navigation.html.tmpl | 13 +- template/en/default/global/textarea.html.tmpl | 6 + template/en/default/global/user-error.html.tmpl | 272 ++++++++++----------- template/en/default/global/userselect.html.tmpl | 50 +++- template/en/default/global/value-descs.js.tmpl | 33 +++ template/en/default/global/variables.none.tmpl | 2 + 19 files changed, 445 insertions(+), 342 deletions(-) create mode 100644 template/en/default/global/reason-descs.none.tmpl create mode 100644 template/en/default/global/value-descs.js.tmpl (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 753695b..54e05f6 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -37,17 +37,7 @@ [% DEFAULT title = "Internal Error" %] [% error_message = BLOCK %] - [% IF error == "action_unrecognized" %] - [% docslinks = {'query.html' => "Searching for $terms.bugs", - 'query.html#list' => "$terms.Bug lists"} %] - I don't recognize the value ([% action FILTER html %]) - of the action variable. - - [% ELSIF error == "attachment_already_obsolete" %] - Attachment #[% attach_id FILTER html %] ([% description FILTER html %]) - is already obsolete. - - [% ELSIF error == "attachment_local_storage_disabled" %] + [% IF error == "attachment_local_storage_disabled" %] [% title = "Local Storage Disabled" %] You cannot store attachments locally. This feature is disabled. @@ -139,7 +129,7 @@ [% ELSIF error == "db_rename_conflict" %] Name conflict: Cannot rename [% old FILTER html %] to - [% new FILTER html %] because [% new FILTER html %] already exists. + [%+ new FILTER html %] because [% new FILTER html %] already exists. [% ELSIF error == "cookies_need_value" %] Every cookie must have a value. @@ -156,6 +146,11 @@ address. [% END %] + [% ELSIF error == "extension_disabled" %] + [% title = "Extension Disabled" %] + You cannot access this page because the extension '[% name FILTER html %]' + is disabled. + [% ELSIF error == "extension_must_be_subclass" %] [% package FILTER html %] from [% filename FILTER html %] is not a subclass of @@ -216,13 +211,9 @@ [% ELSIF error == "illegal_field" %] A legal [% field FILTER html %] was not set. - [% ELSIF error == "inactive_group" %] - Attempted to add [% terms.bug %] to the '[% name FILTER html %]' - group, which is not used for [% terms.bugs %]. - [% ELSIF error == "invalid_attach_id_to_obsolete" %] The attachment number of one of the attachments you wanted to obsolete, - [% attach_id FILTER html %], is invalid. + [%+ attach_id FILTER html %], is invalid. [% ELSIF error == "invalid_customfield_type" %] [% title = "Invalid Field Type" %] @@ -260,7 +251,7 @@ Attachment [% attach_id FILTER html %] ([% description FILTER html %]) is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %], but you tried to flag it as obsolete while creating a new attachment to - [% terms.bug %] [%+ my_bug_id FILTER html %]. + [%+ terms.bug %] [%+ my_bug_id FILTER html %]. [% ELSIF error == "feature_disabled" %] The [% install_string("feature_$feature") FILTER html %] feature is not @@ -281,13 +272,6 @@ You can't ask a specific person for [% type.name FILTER html %]. - [% ELSIF error == "flag_status_invalid" %] - The flag status [% status FILTER html %] - [% IF id %] - for flag ID #[% id FILTER html %] - [% END %] - is invalid. - [% ELSIF error == "flag_type_inactive" %] [% title = "Inactive Flag Type" %] The flag type [% type FILTER html %] is inactive and cannot be used @@ -356,7 +340,7 @@ [% ELSIF error == "mail_send_error" %] There was an error sending mail from '[% mail.header('From') FILTER html %]' to '[% mail.header('To') FILTER html %]': - [% msg FILTER html %] + [%+ msg FILTER html %] [% ELSIF error == "missing_bug_id" %] No [% terms.bug %] ID was given. @@ -370,14 +354,10 @@ [% ELSIF error == "need_quipid" %] A valid quipid is needed. - [% ELSIF error == "no_manual_moved" %] - You cannot set the resolution of [% terms.abug %] to [% display_value("resolution", "MOVED") FILTER html %] without - moving the [% terms.bug %]. - - [% ELSIF error == "no_open_bug_status" %] - [% title = "$terms.Bug Cannot Be Confirmed" %] - There is no valid transition from - [%+ display_value("bug_status", "UNCONFIRMED") FILTER html %] to an open state. + [% ELSIF error == "object_dep_sort_loop" %] + There is a loop in VALIDATOR_DEPENDENCIES involving + '[%+ field FILTER html %]'. Here are the fields we considered: + [%+ considered.join(', ') FILTER html %]. [% ELSIF error == "param_invalid" %] [% title = "Invalid Parameter" %] @@ -431,9 +411,6 @@ An error occurred while preparing for a RADIUS authentication request: [% errstr FILTER html %]. - [% ELSIF error == "request_queue_group_invalid" %] - The group field [% group FILTER html %] is invalid. - [% ELSIF error == "report_axis_invalid" %] [% val FILTER html %] is not a valid value for [%+ IF fld == "x" %]the horizontal axis @@ -443,7 +420,7 @@ [% ELSIF error == "setting_info_invalid" %] To create a new setting, you must supply a setting name, a list of - value/sortindex pairs, and the devault value. + value/sortindex pairs, and the default value. [% ELSIF error == "setting_name_invalid" %] The setting name [% name FILTER html %] is not a valid @@ -473,13 +450,6 @@ [% ELSIF error == "undefined_field" %] Form field [% field FILTER html %] was not defined. - [% ELSIF error == "unknown_action" %] - [% IF action %] - Unknown action [% action FILTER html %]! - [% ELSE %] - I could not figure out what you wanted to do. - [% END %] - [% ELSIF error == "unknown_method" %] The requested method '[% method FILTER html %]' was not found. @@ -562,6 +532,9 @@ +

Traceback:

+
[% traceback FILTER html %]
+ [% IF variables %] 
 Variables:
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index a0d080a..6f99a64 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -24,7 +24,7 @@