diff options
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 39 | ||||
| -rw-r--r-- | template/en/default/global/confirm-user-match.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 19 | ||||
| -rw-r--r-- | template/en/default/global/select-menu.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 78 |
6 files changed, 78 insertions, 69 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 60ae95043..939c0c4dc 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -28,6 +28,9 @@ [%# This is a list of all the possible code errors. Please keep them in # alphabetical order by error tag, and leave a blank line between errors. + # + # Note that you must explicitly filter every single template variable + # in this file; if you do not wish to change it, use the "none" filter. #%] [% PROCESS global/variables.none.tmpl %] @@ -35,14 +38,7 @@ [% DEFAULT title = "Internal Error" %] [% error_message = BLOCK %] - [% IF error == "aaa_example_error_tag" %] - [% title = "Example Error" %] - This is an example error. The title is set above. This text is the body - of the error. It can contain arbitrary <b>HTML</b>, and also references - to any [% parameters %] which you may have set before calling - ThrowCodeError. - - [% ELSIF error == "action_unrecognized" %] + [% IF error == "action_unrecognized" %] I don't recognize the value (<em>[% variables.action FILTER html %]</em>) of the <em>action</em> variable. @@ -61,8 +57,8 @@ An authorization handler return value was not handled by the login code. [% ELSIF error == "bug_error" %] - Trying to retrieve [% terms.bug %] [%+ bug.bug_id %] returned the error - [% bug.error FILTER html %] + Trying to retrieve [% terms.bug %] [%+ bug.bug_id FILTER html %] returned + the error [% bug.error FILTER html %]. [% ELSIF error == "chart_data_not_generated" %] The tool which gathers [% terms.bug %] counts has not been run yet. @@ -82,7 +78,7 @@ Run checksetup.pl for installation instructions. [% ELSIF error == "field_type_mismatch" %] - Cannot seem to handle <code>[% field %]</code> + Cannot seem to handle <code>[% field FILTER html %]</code> and <code>[% type FILTER html %]</code> together. [% ELSIF error == "gd_not_installed" %] @@ -107,8 +103,8 @@ '[% bit FILTER html %]'. [% ELSIF error == "bad_arg" %] - Bad argument <code>[% argument %]</code> sent to - <code>[% function %]</code> function. + Bad argument <code>[% argument FILTER html %]</code> sent to + <code>[% function FILTER html %]</code> function. [% ELSIF error == "invalid_attach_id_to_obsolete" %] The attachment number of one of the attachments you wanted to obsolete, @@ -145,11 +141,8 @@ but you tried to flag it as obsolete while creating a new attachment to [% terms.bug %] [%+ my_bug_id FILTER html %]. - [% ELSIF error == "no_bug_data" %] - No data when fetching [% terms.bug %] [%+ bug_id %]. - [% ELSIF error == "flag_nonexistent" %] - There is no flag with ID #[% variables.id %]. + There is no flag with ID #[% variables.id FILTER html %]. [% ELSIF error == "flag_status_invalid" %] The flag status <em>[% variables.status FILTER html %]</em> is invalid. @@ -166,7 +159,7 @@ a positive integer. [% ELSIF error == "flag_type_nonexistent" %] - There is no flag type with the ID <em>[% variables.id %]</em>. + There is no flag type with the ID <em>[% variables.id FILTER html %]</em>. [% ELSIF error == "flag_type_product_nonexistent" %] The product <em>[% variables.product FILTER html %]</em> does not exist. @@ -212,7 +205,7 @@ Something is seriously wrong with the token generation system. [% ELSIF error == "template_error" %] - [% template_error_msg %] + [% template_error_msg FILTER html %] [% ELSIF error == "unable_to_retrieve_password" %] I was unable to retrieve your old password from the database. @@ -238,9 +231,9 @@ [% ELSE %] [%# Give sensible error if error functions are used incorrectly. #%] - You are using [% terms.Bugzilla %]'s ThrowCodeError() function incorrectly. You - passed in the string '[% error %]'. The correct use is to pass - in a tag, and define that tag in the file code-error.html.tmpl.<br> + You are using [% terms.Bugzilla %]'s ThrowCodeError() function incorrectly. + You passed in the string '[% error FILTER html %]'. The correct use is to + pass in a tag, and define that tag in the file code-error.html.tmpl.<br> <br> If you are a [% terms.Bugzilla %] end-user seeing this message, please save this page and send it to [% Param('maintainer') %]. @@ -267,7 +260,7 @@ <tr> <td bgcolor="#ff0000"> <font size="+2"> - [% error_message %] + [% error_message FILTER none %] </font> </td> </tr> diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 037f7385c..ec4c4f150 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -38,7 +38,7 @@ # self-referential URL #%] -[% # use the global field descs %] +[%# use the global field descs %] [% PROCESS "global/field-descs.none.tmpl" %] [% IF matchsuccess == 1 %] @@ -74,7 +74,7 @@ </td> </tr> - [% # this is messy to allow later expansion %] + [%# this is messy to allow later expansion %] [% FOREACH field = matches %] <tr> @@ -173,7 +173,7 @@ [% IF field_descs.${field_name} %] [% field_descs.${field_name} FILTER html -%] - [%- # ELSIF for things that don't belong in the field_descs hash here -%] + [%-# ELSIF for things that don't belong in the field_descs hash here -%] [% ELSIF field_name.match("^requestee") %] [% fields.${field_name}.flag_type.name %] requestee diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index e8aa8047f..e84e9747d 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -28,21 +28,15 @@ [% message_tag = message %] [% message = BLOCK %] - [% IF message_tag == "aaa_example_message_tag" %] - [% title = "Example Message" %] - This is an example message. The title is set above. This text is the body - of the message. It can contain arbitrary <b>HTML</b>, and also references - to any [% parameters %] which you may have set. - - [% ELSIF message_tag == "buglist_adding_field" %] + [% IF message_tag == "buglist_adding_field" %] [% title = "Adding field to query page..." %] [% link = "Click here if the page does not redisplay automatically." %] - [% # --- %] [% ELSIF message_tag == "buglist_load_named_query" %] - [% title = BLOCK %]Loading your query named [% namedcmd %][% END %] + [% title = BLOCK %] + Loading your query named [% namedcmd FILTER html %] + [% END %] [% link = "Click here if the page does not redisplay automatically." %] - [% # --- %] [% ELSIF message_tag == "buglist_updated_named_query" %] OK, your query named <code>[% queryname FILTER html %]</code> is updated. @@ -81,8 +75,9 @@ [% ELSIF message_tag == "email_change_cancelled_reinstated" %] [% title = "Cancel Request to Change Email Address" %] The request to change the email address for the - [% old_email %] account to [% new_email %] has been cancelled. - Your old account settings have been reinstated. + [% old_email FILTER html %] account to + [% new_email FILTER html %] has been cancelled. + Your old account settings have been reinstated. [% ELSIF message_tag == "logged_out" %] [% title = "Logged Out" %] diff --git a/template/en/default/global/select-menu.html.tmpl b/template/en/default/global/select-menu.html.tmpl index 7b7fddb29..f1768d0d5 100644 --- a/template/en/default/global/select-menu.html.tmpl +++ b/template/en/default/global/select-menu.html.tmpl @@ -44,7 +44,7 @@ [% options_type = BLOCK %][% options %][% END %] <select name="[% name FILTER html %]" - [% IF onchange %]onchange="[% onchange %]"[% END %] + [% IF onchange %]onchange="[% onchange FILTER html %]"[% END %] [% IF multiple %] multiple [% IF size %] size="[% size %]" [% END %] [% END %]> [% IF options_type.search("ARRAY") %] [% FOREACH value = options %] diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 889a5091a..135dad987 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -73,7 +73,8 @@ [% ' | <a href="sanitycheck.cgi">Sanity check</a>' IF user.groups.tweakparams %] - | <a href="relogin.cgi">Log out</a> [% user.login %] + | <a href="relogin.cgi">Log out</a> + [% user.login FILTER html %] </td> </tr> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index de5d60c6c..b1cf46ecb 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -27,6 +27,9 @@ [%# This is a list of all the possible user errors. Please keep them in # alphabetical order by error tag, and leave a blank line between errors. + # + # Note that you must explicitly filter every single template variable + # in this file; if you do not wish to change it, use the "none" filter. #%] [% PROCESS global/variables.none.tmpl %] @@ -44,7 +47,7 @@ [% ELSIF error == "account_disabled" %] [% title = "Account Disabled" %] - [% disabled_reason %] + [% disabled_reason FILTER none %] <hr> If you believe your account should be restored, please send email to [% Param("maintainer") %] explaining why. @@ -72,7 +75,7 @@ [% ELSIF error == "alias_in_use" %] [% title = "Alias In Use" %] - [% bug_link %] has already taken the alias + [% bug_link FILTER none %] has already taken the alias <em>[% alias FILTER html %]</em>. Please choose another one. [% ELSIF error == "alias_is_numeric" %] @@ -95,7 +98,7 @@ [% ELSIF error == "authorization_failure" %] [% title = "Authorization Failed" %] - You are not allowed to [% action %]. + You are not allowed to [% action FILTER html %]. [% ELSIF error == "attachment_access_denied" %] [% title = "Access Denied" %] @@ -103,13 +106,14 @@ [% ELSIF error == "bug_access_denied" %] [% title = "Access Denied" %] - You are not authorized to access [% terms.bug %] #[% bug_id %]. + You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %]. [% ELSIF error == "bug_access_query" %] [% title = "Access Denied" %] - You are not authorized to access [% terms.bug %] #[% bug_id %]. To see - this [% terms.bug %], you must - first <a href="show_bug.cgi?id=[% bug_id %]&GoAheadAndLogIn=1">log + You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %]. + To see this [% terms.bug %], you must + first <a href="show_bug.cgi?id= + [% bug_id FILTER url_quote %]&GoAheadAndLogIn=1">log in to an account</a> with the appropriate permissions. [% ELSIF error == "buglist_parameters_required" %] @@ -139,7 +143,7 @@ [% title = "Dependency Loop Detected" %] The following [% terms.bug %](s) would appear on both the "depends on" and "blocks" parts of the dependency tree if these changes - are committed: [% both %]. This would create a circular + are committed: [% both FILTER none %]. This would create a circular dependency, which is not allowed. [% ELSIF error == "dependency_loop_single" %] @@ -176,7 +180,8 @@ [% ELSIF error == "file_too_large" %] [% title = "File Too Large" %] - The file you are trying to attach is [% filesize %] kilobytes (KB) in size. + The file you are trying to attach is [% filesize FILTER html %] + kilobytes (KB) in size. Non-patch attachments cannot be more than [% Param('maxattachmentsize') %] KB. If your attachment is an image, try converting it to a compressable @@ -187,8 +192,10 @@ [% title = "Flag Requestee Not Authorized" %] You asked [% requestee.identity FILTER html %] - for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] [% bug_id -%] - [% IF attach_id %], attachment [% attach_id %][% END %], but that [% terms.bug %]&bnsp; + for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] + [% bug_id FILTER html -%] + [% IF attach_id %], attachment [% attach_id FILTER html %][% END %], + but that [% terms.bug %]&bnsp; has been restricted to users in certain groups, and the user you asked isn't in all the groups to which the [% terms.bug %] has been restricted. Please choose someone else to ask, or make the [% terms.bug %] accessible to users @@ -198,8 +205,10 @@ [% title = "Flag Requestee Not Authorized" %] You asked [% requestee.identity FILTER html %] - for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] [% bug_id %], - attachment [% attach_id %], but that attachment is restricted to users + for <code>[% flag_type.name FILTER html %]</code> on + [% terms.bug %] [% bug_id FILTER html %], + attachment [% attach_id FILTER html %], but that attachment is restricted + to users in the [% Param("insidergroup") FILTER html %] group, and the user you asked isn't in that group. Please choose someone else to ask, or ask an administrator to add the user to the group. @@ -233,11 +242,12 @@ [% ELSIF error == "illegal_attachment_edit" %] [% title = "Unauthorised Action" %] - You are not authorised to edit attachment [% attach_id %]. + You are not authorised to edit attachment [% attach_id FILTER html %]. [% ELSIF error == "illegal_attachment_edit_bug" %] [% title = "Unauthorised Action" %] - You are not authorised to edit attachments on [% terms.bug %] [%+ bug_id %]. + You are not authorised to edit attachments on [% terms.bug %] + [%+ bug_id FILTER html %]. [% ELSIF error == "illegal_attachment_is_patch" %] [% title = "Your Query Makes No Sense" %] @@ -246,7 +256,8 @@ [% ELSIF error == "illegal_change" %] [% title = "Not allowed" %] - You tried to change the <strong>[% field %]</strong> field + You tried to change the + <strong>[% field_descs.$field FILTER html %]</strong> field from <em>[% oldvalue FILTER html %]</em> to <em>[% newvalue FILTER html %]</em>, but only the owner or submitter of the [% terms.bug %], or a @@ -320,7 +331,7 @@ [% ELSIF error == "invalid_bug_id_non_existent" %] [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] - [% terms.Bug %] #[% bug_id %] does not exist. + [% terms.Bug %] #[% bug_id FILTER html %] does not exist. [% ELSIF error == "invalid_bug_id_or_alias" %] [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] @@ -383,7 +394,8 @@ [% ELSIF error == "milestone_required" %] [% title = "Milestone Required" %] - You must determine a target milestone for [% terms.bug %] [%+ bug_id %] + You must determine a target milestone for [% terms.bug %] + [%+ bug_id FILTER html %] if you are going to accept it. Part of accepting [% terms.abug %] is giving an estimate of when it will be fixed. @@ -459,7 +471,8 @@ [% ELSIF error == "need_positive_number" %] [% title = "Positive Number Required" %] - The <em>[% field_descs.$field %]</em> field requires a positive number. + The <em>[% field_descs.$field FILTER html %]</em> field requires a positive + number. [% ELSIF error == "need_product" %] [% title = "Product Required" %] @@ -499,7 +512,8 @@ [% ELSIF error == "no_dupe_stats" %] [% title = "Cannot Find Duplicate Statistics" %] - There are no duplicate statistics for today ([% today %]) or yesterday. + There are no duplicate statistics for today ([% today FILTER html %]) + or yesterday. [% ELSIF error == "no_dupe_stats_error_today" %] [% title = "Error Reading Today's Dupes File" %] @@ -513,7 +527,8 @@ [% ELSIF error == "no_dupe_stats_error_yesterday" %] [% title = "Error Reading Yesterday's Dupes File" %] - There are no duplicate statistics for today ([% today %]), and an error + There are no duplicate statistics for today ([% today FILTER html %]), + and an error occurred opening yesterday's dupes file: [% error_msg FILTER html %]. [% ELSIF error == "no_html_in_quips" %] @@ -558,7 +573,8 @@ [% ELSIF error == "patch_too_large" %] [% title = "File Too Large" %] - The file you are trying to attach is [% filesize %] kilobytes (KB) in size. + The file you are trying to attach is [% filesize FILTER html %] + kilobytes (KB) in size. Patches cannot be more than [% Param('maxpatchsize') %] KB in size. Try breaking your patch into several pieces. @@ -568,7 +584,8 @@ [% ELSIF error == "product_edit_denied" %] [% title = "Product Edit Access Denied" %] - You are not permitted to edit [% terms.bugs %] in product [% product %]. + You are not permitted to edit [% terms.bugs %] in product + [% product FILTER html %]. [% ELSIF error == "query_name_missing" %] [% title = "No Query Name Specified" %] @@ -620,15 +637,17 @@ [% ELSIF error == "too_many_votes_for_bug" %] [% title = "Illegal Vote" %] - You may only use at most [% max %] votes for a single [% terms.bug %] in the + You may only use at most [% max FILTER html %] votes for a single + [%+ terms.bug %] in the <tt>[% prod FILTER html %]</tt> product, but you are trying to use - [% votes %]. + [% votes FILTER html %]. [% ELSIF error == "too_many_votes_for_product" %] [% title = "Illegal Vote" %] - You may only use at most [% max %] votes for [% terms.bugs %] in the + You may only use at most [% max FILTER html %] votes for [% terms.bugs %] + in the <tt>[% prod FILTER html %]</tt> product, but you are trying to use - [% votes %]. + [% votes FILTER html %]. [% ELSIF error == "token_inexistent" %] [% title = "Token Does Not Exist" %] @@ -662,7 +681,8 @@ [% ELSIF error == "value_out_of_range" %] [% title = "Value Out Of Range" %] - Value is out of range for field <em>[% field_descs.$field %]</em>. + Value is out of range for field + <em>[% field_descs.$field FILTER html %]</em>. [% ELSIF error == "zero_length_file" %] [% title = "File Is Empty" %] @@ -684,7 +704,7 @@ <tr> <td bgcolor="#ff0000"> <font size="+2"> - [% error_message %] + [% error_message FILTER none %] </font> </td> </tr> |