diff options
| author | gerv%gerv.net <> | 2003-07-04 06:31:13 +0200 |
|---|---|---|
| committer | gerv%gerv.net <> | 2003-07-04 06:31:13 +0200 |
| commit | 44b48df3901d829e1423749136d142964ccb4a3e (patch) | |
| tree | f87659c97f6c97654cde63005c514a5504913631 /template/en/default/bug | |
| parent | 7b35e1a271f27612cba91216d50e5f497dd0c69a (diff) | |
| download | bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.gz bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.xz | |
Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.
Diffstat (limited to 'template/en/default/bug')
24 files changed, 437 insertions, 389 deletions
diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl index 2e44f89fd..4a7461b60 100644 --- a/template/en/default/bug/activity/show.html.tmpl +++ b/template/en/default/bug/activity/show.html.tmpl @@ -25,11 +25,13 @@ # This template also needs to be called with the interface to the # activity.html.tmpl template fulfilled. #%] - -[% PROCESS global/header.html.tmpl - title = "Changes made to bug $bug_id" + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Changes made to $terms.bug $bug_id" h1 = "Activity log" - h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" + h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] <br> @@ -37,7 +39,7 @@ [% PROCESS bug/activity/table.html.tmpl %] <p> - <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a> + <a href="show_bug.cgi?id=[% bug_id %]">Back to [% terms.bug %] [% bug_id %]</a> </p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 95beaef14..ec005cc38 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -23,7 +23,7 @@ # operations: array of hashes. May be empty. Each has has three members: # who: string. who performed the operation # when: string. when they performed it - # changes: hash. Details of what they changed. This hash has three + # changes: hash. Details of what they changed. This hash has three # compulsory and one optional member: # field: string. The name of the field # removed: string. What was removed from the field @@ -33,14 +33,16 @@ # it was affected by an old Bugzilla bug.) #%] +[% PROCESS global/variables.none.tmpl %] + [% PROCESS bug/time.html.tmpl %] - + [% IF incomplete_data %] <p> - There used to be a bug Bugzilla which caused activity data + There used to be a [% terms.bug %] in [% terms.Bugzilla %] which caused activity data to be lost if there was a large number of cc's or dependencies. That - has been fixed, however, there was some data already lost on this bug - that could not be regenerated. The changes that the script could not + has been fixed, however, there was some data already lost on this [% terms.bug %] that + could not be regenerated. The changes that the script could not reliably determine are prefixed by '?'. </p> [% END %] @@ -55,7 +57,7 @@ <th>Added</th> </tr> - [% FOREACH operation = operations %] + [% FOREACH operation = operations %] <tr> <td rowspan="[% operation.changes.size %]" valign="top"> [% operation.who %] @@ -68,7 +70,7 @@ <td> [% IF change.attachid %] <a href="attachment.cgi?id=[% change.attachid %]&action=view"> - Attachment #[% change.attachid %]</a> + Attachment #[% change.attachid %]</a> [% END %] [% change.field %] </td> diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl index f965ccc4d..4b67c306f 100644 --- a/template/en/default/bug/choose.html.tmpl +++ b/template/en/default/bug/choose.html.tmpl @@ -19,15 +19,17 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/header.html.tmpl - title = "Search by bug number" +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Search by $terms.bug number" %] <form method="get" action="show_bug.cgi"> <p> - You may find a single bug by entering its bug id here: + You may find a single [% terms.bug %] by entering its [% terms.bug %] id here: <input name="id" size="6"> - <input type="submit" value="Show Me This Bug"> + <input type="submit" value="Show Me This [% terms.Bug %]"> </p> </form> diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 7ab7436a7..60faa0f03 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -24,21 +24,23 @@ # This template has the same interface as create.html.tmpl #%] +[% PROCESS global/variables.none.tmpl %] + [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] [% PROCESS global/header.html.tmpl - title = "Enter A Bug" + title = "Enter $terms.ABug" onload = "PutDescription()" %] <p> <font color="red"> - This is a template used on mozilla.org - it, along with the + This is a template used on mozilla.org - it, along with the comment-guided.txt.tmpl template, are included as a demo of what it's - possible to do with custom templates in general, and custom bug entry + possible to do with custom templates in general, and custom [% terms.bug %] entry templates in particular. It is recommended that this template be - customised if you want to use it on your Bugzilla installation. + customised if you want to use it on your [% terms.Bugzilla %] installation. </font> </p> @@ -66,15 +68,15 @@ function PutDescription() { [%# Browser sniff to try and reduce the incidence of 4.x and NS 6/7 bugs %] [% IF cgi.user_agent("Mozilla/4") AND NOT cgi.user_agent("compatible") %] - <div style="background-color: lightgrey; - border: 1px solid black; + <div style="background-color: lightgrey; + border: 1px solid black; padding: 2px"> <font color="#990000"> <b> - Note: This is a tool for reporting bugs in software from mozilla.org. + Note: This is a tool for reporting [% terms.bugs %] in software from mozilla.org. Use Netscape's - <a href="http://help.netscape.com/forms/bug-client.html">bug reporting - form</a> to report bugs with Netscape products like Navigator 4.x. + <a href="http://help.netscape.com/forms/bug-client.html">[% terms.bug %] reporting + form</a> to report [% terms.bugs %] with Netscape products like Navigator 4.x. Netscape products have a blue and black N in the top right hand corner. </b> @@ -84,74 +86,74 @@ function PutDescription() { [% IF cgi.user_agent('Netscape(\d)') %] [% matches = cgi.user_agent().match('Netscape(\d)') %] - <div style="background-color: lightgrey; - border: 1px solid black; + <div style="background-color: lightgrey; + border: 1px solid black; padding: 2px"> <font color="#990000"> <b> - You are using Netscape [% matches.0 %]. - Report bugs with this browser to the + You are using Netscape [% matches.0 %]. + Report [% terms.bugs %] with this browser to the <a href="http://home.netscape.com/browsers/[% matches.0 %]/feedback/index.html"> Netscape [% matches.0 %] Feedback Center.</a> </b> </font> - This form is only for reporting bugs in the Mozilla web browser and other - products from mozilla.org. To report a bug you find in - Netscape [% matches.0 %] with this form, - you must reproduce it first in a + This form is only for reporting [% terms.bugs %] in the Mozilla web browser and other + products from mozilla.org. To report [% terms.abug %] you find in + Netscape [% matches.0 %] with this form, + you must reproduce it first in a <a href="http://ftp.mozilla.org/pub/mozilla/nightly/latest/"> - recent build</a> of Mozilla to make sure the problem hasn't been + recent build</a> of Mozilla to make sure the problem hasn't been fixed already. </div> [% END %] <p> This form prompts you for the information required to - file a good bug report (or enhancement request.) - It may seem lengthy, but developers need all this information - to understand and reproduce the bug, which is the first step towards - fixing it. Please note that <strong>we do not accept bug reports by - email</strong> - please do not email developers or mozilla.org staff - with bug reports. <font color="red">Also, please do not - file Mozilla bugs on copies of Mozilla older than two weeks - first, - download a + file a good [% terms.bug %] report (or enhancement request.) + It may seem lengthy, but developers need all this information + to understand and reproduce the [% terms.bug %], which is the first step towards + fixing it. Please note that <strong>we do not accept [% terms.bug %] reports by + email</strong> - please do not email developers or mozilla.org staff + with [% terms.bug %] reports. <font color="red">Also, please do not + file Mozilla [% terms.bugs %] on copies of Mozilla older than two weeks - first, + download a <a href="http://ftp.mozilla.org/pub/mozilla/nightly/latest/">newer build</a> and check that the problem is still present. </font> </p> -<a name="step1"></a> -<h3>Step 1 - search for your bug</h3> +<a name="step1"></a> +<h3>Step 1 - search for your [% terms.bug %]</h3> <p> - You need to see if your bug has already been reported. - <font color="red">Please don't skip this step.</font> - 50% of the bugs filed in - Bugzilla are duplicates, and and this wastes a lot of our QA engineers' time. + You need to see if your [% terms.bug %] has already been reported. + <font color="red">Please don't skip this step.</font> + 50% of the [% terms.bugs %] filed in + [% terms.Bugzilla %] are duplicates, and and this wastes a lot of our QA engineers' time. </p> [%# Stop NS 4.x and all v.3 browsers from getting <iframe> code %] -[% IF (cgi.user_agent("Mozilla/4") - AND NOT cgi.user_agent("compatible")) +[% IF (cgi.user_agent("Mozilla/4") + AND NOT cgi.user_agent("compatible")) OR (cgi.user_agent("Mozilla/[123]")) %] <p> - Visit the <a href="duplicates.cgi">most-frequently-reported bugs page</a> - and see if your bug is there. If not, go to the - <a href="query.cgi?format=modern">search page</a> - and search Bugzilla by entering two or - three of the main words having to do with your bug in the top box. + Visit the <a href="duplicates.cgi">most-frequently-reported [% terms.bugs %] page</a> + and see if your [% terms.bug %] is there. If not, go to the + <a href="query.cgi?format=modern">search page</a> + and search [% terms.Bugzilla %] by entering two or + three of the main words having to do with your [% terms.bug %] in the top box. For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. - </p> + </p> [% ELSE %] <p> - Check the list of most-frequently-reported bugs below. - If your bug isn't there, search Bugzilla by entering two or - three of the main words having to do with your bug in this box. + Check the list of most-frequently-reported [% terms.bugs %] below. + If your [% terms.bug %] isn't there, search [% terms.Bugzilla %] by entering two or + three of the main words having to do with your [% terms.bug %] in this box. For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. - </p> + </p> <script type="text/javascript" language="JavaScript"> - [%# Tell QuickSearch to use the custom-supplied load_relative_url() + [%# Tell QuickSearch to use the custom-supplied load_relative_url() function. This was originally designed for the sidebar, hence the variable name. %] var sidebar = 1; @@ -161,19 +163,19 @@ function PutDescription() { } </script> - <script type="text/javascript" language="JavaScript" + <script type="text/javascript" language="JavaScript" src="localconfig.js"></script> - <script type="text/javascript" language="JavaScript" + <script type="text/javascript" language="JavaScript" src="quicksearch.js"></script> <form name="f" action="show_bug.cgi" method="get" - onsubmit="QuickSearch(f.id.value); return false;"> + onsubmit="QuickSearch(f.id.value); return false;"> <input type="text" name="id" size="40"> <input type="submit" value="Search"> </form> - <iframe name="somebugs" width="100%" height="80%" + <iframe name="somebugs" width="100%" height="80%" style="border: 2px black solid" src="duplicates.cgi?product=[% product FILTER uri %]&format=simple"> </iframe> @@ -181,41 +183,41 @@ function PutDescription() { <p> Look through the search results. If you get the - <tt><b>Zarro Boogs</b></tt> message, Bugzilla found no bugs that + <tt><b>Zarro Boogs</b></tt> message, [% terms.Bugzilla %] found no [% terms.bugs %] that match. Check for typos, or add fewer or different keywords. </p> <p> - If you find a bug that looks the same as yours, you can add - useful comments to that bug, but please don't open a new one. - Please don't add comments like "please fix this bug" - this + If you find [% terms.abug %] that looks the same as yours, you can add + useful comments to that [% terms.bug %], but please don't open a new one. + Please don't add comments like "please fix this [% terms.bug %]" - this tends to annoy engineers and slow, rather than speed, the fixing of it. </p> <p> - If you find bugs similar to yours, read them and note which component - they are in. You should file your bug in that same component. + If you find [% terms.bugs %] similar to yours, read them and note which component + they are in. You should file your [% terms.bug %] in that same component. </p> -<a name="step2"></a> +<a name="step2"></a> <h3>Step 2 - give information</h3> <p> - If you're pretty certain that your bug isn't in there already, then + If you're pretty certain that your [% terms.bug %] isn't in there already, then please try to complete this form as accurately as you can. The more you can tell us, the better our chance of being able - to understand and reproduce your bug. + to understand and reproduce your [% terms.bug %]. </p> -<form method="post" action="post_bug.cgi"> +<form method="post" action="post_bug.cgi"> <input type="hidden" name="format" value="guided"> <input type="hidden" name="assigned_to" value=""> - <input type="hidden" name="priority" + <input type="hidden" name="priority" value="[% default.priority FILTER html %]"> - <input type="hidden" name="version" + <input type="hidden" name="version" value="[% default.version FILTER html %]"> - + <table valign="top" cellpadding="5" cellspacing="5" border="0"> <tr bgcolor="[% tablecolour %]"> @@ -233,18 +235,18 @@ function PutDescription() { <b>Component</b> </td> <td valign="top"> - <p> + <p> The area where the problem occurs. - To pick the right component, you could use the same one as - similar bugs you found in your search, or read the full list of + To pick the right component, you could use the same one as + similar [% terms.bugs %] you found in your search, or read the full list of <a href="describecomponents.cgi?product=[% product %]">component descriptions</a> if you need more help. </p> - + <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td valign="top"> - <select name="component" id="component" + <td valign="top"> + <select name="component" id="component" size="5" onchange="PutDescription()"> [% FOREACH c = component_ %] <option value="[% c.name FILTER html %]" @@ -257,7 +259,7 @@ function PutDescription() { <td valign="top" width="100%"> <div id="description" style="color: green; margin-left: 10px; height: 5em; overflow: auto;"> - <script type="text/javascript" language="JavaScript"> + <script type="text/javascript" language="JavaScript"> if ((document.getElementById) && (document.body.innerHTML)) { document.write("\ Select a component to see its description here."); @@ -291,7 +293,7 @@ function PutDescription() { <td align="right" valign="middle"> <b>Operating System</b> </td> - <td valign="top"> + <td valign="top"> [% PROCESS select sel = 'op_sys' %] </td> </tr> @@ -305,16 +307,16 @@ function PutDescription() { </td> <td valign="top"> <p> - If reporting a bug in Mozilla, - this is the line beginning <tt>"Mozilla/5.0"</tt> in - <tt>Help | About Mozilla</tt>. + If reporting [% terms.abug %] in Mozilla, + this is the line beginning <tt>"Mozilla/5.0"</tt> in + <tt>Help | About Mozilla</tt>. It identifies exactly the version of Mozilla you were using. If you are using the problem copy of Mozilla, this will be filled in correctly for you already. If Mozilla won't start, just enter the URL of the directory you downloaded it from. </p> - <input type="text" size="80" name="buildid" value="[% buildid %]"> + <input type="text" size="80" name="buildid" value="[% buildid %]"> </td> </tr> @@ -325,9 +327,9 @@ function PutDescription() { <td valign="top"> <p> URL that demonstrates the problem you are seeing (optional.) - <b>IMPORTANT</b>: If you are filing a bug about a broken web page, - you need to read the - <a href="http://www.mozilla.org/docs/web-developer/faq.html">Mozilla + <b>IMPORTANT</b>: If you are filing [% terms.abug %] about a broken web page, + you need to read the + <a href="http://www.mozilla.org/docs/web-developer/faq.html">Mozilla Web Developer FAQ</a>, which explains how we handle old or badly-coded web pages. </p> @@ -337,13 +339,13 @@ function PutDescription() { <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> - <b>Summary</b> + <b>Summary</b> </td> <td valign="top"> <p> A sentence which summarises the problem. Please be descriptive and use lots of keywords. - </p> + </p> <p> <tt> <font color="#990000">Bad example</font>: mail crashed @@ -360,7 +362,7 @@ function PutDescription() { <tr> <td align="right" valign="middle"> - <b>Details</b> + <b>Details</b> </td> <td valign="top"> <p> @@ -380,7 +382,7 @@ function PutDescription() { right margins. In Mozilla, the text is only left-justified. </tt> </p> - <textarea rows="6" cols="80" name="comment" + <textarea rows="6" cols="80" name="comment" wrap="hard"></textarea> </td> </tr> @@ -412,7 +414,7 @@ function PutDescription() { <tr> <td align="right" valign="middle"> - <b>Steps to Reproduce</b> + <b>Steps to Reproduce</b> </td> <td valign="top"> <p> @@ -429,12 +431,12 @@ function PutDescription() { <tr bgcolor="[% tablecolour %]"> <td valign="middle" align="right"> - <b>Actual Results</b> + <b>Actual Results</b> </td> <td valign="top"> <p> What happened after you performed the steps above? - </p> + </p> <textarea rows="4" cols="80" name="actual_results" wrap="hard"></textarea> </td> @@ -442,31 +444,31 @@ function PutDescription() { <tr> <td valign="middle" align="right"> - <b>Expected Results</b> + <b>Expected Results</b> </td> <td valign="top"> <p> What should the software have done instead? </p> - <textarea rows="4" cols="80" name="expected_results" + <textarea rows="4" cols="80" name="expected_results" wrap="hard"></textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> <td valign="middle" align="right"> - <b>Additional Information</b> + <b>Additional Information</b> </td> <td valign="top"> <p> Add any additional information you feel may be - relevant to this bug, such as the <b>theme</b> you were using - (does the bug still occur + relevant to this [% terms.bug %], such as the <b>theme</b> you were using + (does the [% terms.bug %] still occur with the default theme?), a <b>Talkback crash ID</b>, or special information about <b>your computer's configuration</b>. Any information longer than a few lines, such as a <b>stack trace</b> or <b>HTML - testcase</b>, should be added - using the "Create a new Attachment" link on the bug, after it is filed. + testcase</b>, should be added + using the "Create a new Attachment" link on the [% terms.bug %], after it is filed. <br> <br> If you are reporting a crash, note the module in @@ -475,7 +477,7 @@ function PutDescription() { have MacsBug, attach the results of the <b><tt>how</tt></b> and <b><tt>sc</tt></b> commands. </p> - <textarea rows="8" cols="80" name="additional_info" + <textarea rows="8" cols="80" name="additional_info" wrap="hard"></textarea> </td> </tr> @@ -486,29 +488,29 @@ function PutDescription() { </td> <td valign="top"> <p> - How serious the problem is. Also, if your bug is a request for a new + How serious the problem is. Also, if your [% terms.bug %] is a request for a new feature or enhancement, say so here. </p> <select name="bug_severity"> <option name="blocker" value="blocker"> - Blocker: This bug prevents you from testing or developing the + Blocker: This [% terms.bug %] prevents you from testing or developing the software. </option> <option name="critical" value="critical"> - Critical: The software crashes, hangs, or causes you to + Critical: The software crashes, hangs, or causes you to lose data. </option> <option name="major" value="major"> Major: A major feature is broken. </option> <option name="normal" value="normal" selected="selected"> - Normal: It's a bug that should be fixed. + Normal: It's [% terms.abug %] that should be fixed. </option> <option name="minor" value="minor"> Minor: Minor loss of function, and there's an easy workaround. </option> <option name="trivial" value="trivial"> - Trivial: A cosmetic problem, such as a misspelled word or + Trivial: A cosmetic problem, such as a misspelled word or misaligned text. </option> <option name="enhancement" value="enhancement"> @@ -518,24 +520,24 @@ function PutDescription() { </td> </tr> </table> - - -<a name="step3"></a> -<h3>Step 3 - submit the bug</h3> + + +<a name="step3"></a> +<h3>Step 3 - submit the [% terms.bug %]</h3> <p> - <input type="submit" value=" Submit Bug Report " - onclick="if (this.form.comment.value == '') - { alert('Please enter some details about this bug.'); + <input type="submit" value=" Submit [% terms.Bug %] Report " + onclick="if (this.form.comment.value == '') + { alert('Please enter some details about this [% terms.bug %].'); this.form.comment.focus(); return false; } return true;"> </p> <p> That's it! Thanks very much. You'll be notified by email about any - progress that is made on fixing your bug. + progress that is made on fixing your [% terms.bug %]. </p> - + </form> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 4196f77bb..14ce27180 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -86,7 +86,7 @@ function set_assign_to() { [% INCLUDE 'bug/create/user-message.html.tmpl' %] </td> </tr> - + <tr> <td><br></td> </tr> @@ -94,11 +94,11 @@ function set_assign_to() { <tr> <td align="right" valign="top"><strong>Reporter:</strong></td> <td valign="top">[% reporter FILTER html %]</td> - + <td align="right" valign="top"><strong>Product:</strong></td> <td valign="top">[% product FILTER html %]</td> </tr> - + [%# We can't use the select block in these two cases for various reasons. %] <tr> <td align="right" valign="top"> @@ -112,8 +112,8 @@ function set_assign_to() { </option> [%- END %] </select> - </td> - + </td> + <td align="right" valign="top"> <strong> <a href="describecomponents.cgi?product=[% product FILTER url_quote %]"> @@ -129,49 +129,49 @@ function set_assign_to() { </option> [%- END %] </select> - </td> + </td> </tr> - + <tr> <td> </td> <td colspan="3"></td> </tr> - + <tr> [% sel = { description => 'Platform', name => 'rep_platform' } %] [% INCLUDE select %] - + [% sel = { description => 'OS', name => 'op_sys' } %] [% INCLUDE select %] </tr> - - <tr> + + <tr> [% IF Param('letsubmitterchoosepriority') %] [% sel = { description => 'Priority', name => 'priority' } %] [% INCLUDE select %] [% ELSE %] - <input type="hidden" name="priority" + <input type="hidden" name="priority" value="[% default.priority FILTER html %]"> [% END %] [% sel = { description => 'Severity', name => 'bug_severity' } %] - [% INCLUDE select %] + [% INCLUDE select %] </tr> - + <tr> <td> </td> <td colspan="3"></td> </tr> -[% IF bug_status.size > 1 %] +[% IF bug_status.size > 1 %] <tr> [% sel = { description => 'Initial State', name => 'bug_status' } %] [% INCLUDE select %] - + <td colspan="2"></td> </tr> [% ELSE %] - <input type="hidden" name="bug_status" value="[% default.bug_status %]"> + <input type="hidden" name="bug_status" value="[% default.bug_status %]"> [% END %] <tr> @@ -216,18 +216,18 @@ function set_assign_to() { <tr> <td align="right"><strong>URL:</strong></td> <td colspan="3"> - <input name="bug_file_loc" size="60" + <input name="bug_file_loc" size="60" value="[% bug_file_loc FILTER html %]"> </td> </tr> - + <tr> <td align="right"><strong>Summary:</strong></td> <td colspan="3"> <input name="short_desc" size="60" value="[% short_desc FILTER html %]"> </td> </tr> - + <tr><td align="right" valign="top"><strong>Description:</strong></td> <td colspan="3"> <textarea wrap="hard" name="comment" rows="10" cols="80"> @@ -266,18 +266,18 @@ function set_assign_to() { </td> </tr> [% END %] - + <tr> <td></td> <td colspan="3"> [% IF group.size %] <br> <strong> - Only users in all of the selected groups can view this bug: + Only users in all of the selected groups can view this [% terms.bug %]: </strong> <br> <font size="-1"> - (Leave all boxes unchecked to make this a public bug.) + (Leave all boxes unchecked to make this a public [% terms.bug %].) </font> <br> <br> @@ -294,16 +294,16 @@ function set_assign_to() { [% END %] </td> </tr> - + <tr> <td></td> <td colspan="3"> - <input type="submit" value=" Commit " - onclick="if (this.form.short_desc.value == '') - { alert('Please enter a summary sentence for this bug.'); + <input type="submit" value=" Commit " + onclick="if (this.form.short_desc.value == '') + { alert('Please enter a summary sentence for this [% terms.bug %].'); return false; } return true;"> - <input type="submit" name="maketemplate" + <input type="submit" name="maketemplate" value="Remember values as bookmarkable template"> </td> </tr> @@ -313,8 +313,8 @@ function set_assign_to() { <td></td> <td colspan="3"> <br> - We've made a guess at your operating system and platform. - Please check them and, if we got it wrong, email + We've made a guess at your operating system and platform. + Please check them and, if we got it wrong, email [% Param('maintainer') %]. </td> </tr> @@ -338,7 +338,7 @@ function set_assign_to() { </strong> </td> [% END %] - + <td> <select name="[% sel.name %]"> [%- FOREACH x = ${sel.name} %] diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl index 57f14cb17..06ecefadb 100644 --- a/template/en/default/bug/create/created.html.tmpl +++ b/template/en/default/bug/create/created.html.tmpl @@ -19,8 +19,10 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/header.html.tmpl - title = "Bug $id Submitted" +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "$terms.Bug $id Submitted" %] [% header_done = 1 %] diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl index 958d183cc..6413bb307 100644 --- a/template/en/default/bug/create/make-template.html.tmpl +++ b/template/en/default/bug/create/make-template.html.tmpl @@ -19,14 +19,16 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/header.html.tmpl +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl title = "Bookmarks are your friend" h1 = "Template constructed" %] <p> If you bookmark <a href="enter_bug.cgi?[% url FILTER html %]">this link</a>, -going to the bookmark will bring up the enter bug page with the fields +going to the bookmark will bring up the enter [% terms.bug %] page with the fields initialized as you've requested. </p> diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index d17ea6df0..498925c41 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -28,7 +28,9 @@ # the 'product' variable. #%] -Before reporting a bug, please read the <a href="bugwritinghelp.html"> -bug writing guidelines</a>, please look at the list of -<a href="duplicates.cgi">most frequently reported bugs</a>, and please -<a href="query.cgi">search</a> for the bug. +[% PROCESS global/variables.none.tmpl %] + +Before reporting [% terms.abug %], please read the <a href="bugwritinghelp.html"> +[% terms.bug %] writing guidelines</a>, please look at the list of +<a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please +<a href="query.cgi">search</a> for the [% terms.bug %]. diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl index 2d505a371..a0b3fd80c 100644 --- a/template/en/default/bug/dependency-graph.html.tmpl +++ b/template/en/default/bug/dependency-graph.html.tmpl @@ -24,21 +24,23 @@ # multiple_bugs: boolean. True if bug_id contains > 1 bug number. # doall: boolean. True if we are displaying every bug in the database. # showsummary: boolean. True if we are showing bug summaries. - # rankdir: string. "TB" if we are ranking top-to-bottom, + # rankdir: string. "TB" if we are ranking top-to-bottom, "LR" if left-to-right. # image_url: string. The URL of the graphic showing the dependencies. # map_url: string. The URL of the map file for the image. (Optional) - # image_map: string. The image map for the graphic showing the + # image_map: string. The image map for the graphic showing the dependencies. (Optional) #%] +[% PROCESS global/variables.none.tmpl %] + [% title = "Dependency Graph" h1 = title %] - + [% IF NOT multiple_bugs AND NOT doall %] - [% title = "$title for bug $bug_id" - h1 = "$h1 for bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" + [% title = "$title for $terms.bug $bug_id" + h1 = "$h1 for $terms.bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] [% END %] @@ -47,14 +49,14 @@ [% image_map %] <p> - Green circles represent open bugs. + Green circles represent open [% terms.bugs %]. </p> [% IF image_map %] - <img src="[% image_url %]" alt="Dependency graph" usemap="#imagemap"> + <img src="[% image_url %]" alt="Dependency graph" usemap="#imagemap"> [% ELSE %] <a href="[% map_url %]"> - <img src="[% image_url %]" alt="Dependency graph" ismap="ismap"> + <img src="[% image_url %]" alt="Dependency graph" ismap="ismap"> </a> [% END %] @@ -64,27 +66,27 @@ <table> <tr> <td> - Bug numbers: + [% terms.Bug %] numbers: <input name="id" value="[% bug_id %]"> </td> </tr> - + <tr> <td> - <input type="checkbox" name="doall" + <input type="checkbox" name="doall" [% " checked" IF doall %]> - Show <b>every</b> bug in the system with dependencies + Show <b>every</b> [% terms.bug %] in the system with dependencies </td> </tr> - + <tr> <td colspan="3"> - <input type="checkbox" name="showsummary" + <input type="checkbox" name="showsummary" [% " checked" IF showsummary %]> - Show the summaries of all displayed bugs + Show the summaries of all displayed [% terms.bugs %] </td> </tr> - + <tr> <td colspan="3"> <select name="rankdir"> diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index 64c452c8b..194691e56 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -3,7 +3,7 @@ # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ - # + # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing @@ -21,20 +21,23 @@ # Myk Melez <myk@mozilla.org> #%] -[% PROCESS global/header.html.tmpl - title = "Dependency tree for Bug $bugid" - h1 = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">bug $bugid</a>" +[% INCLUDE global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Dependency tree for $terms.Bug $bugid" + h1 = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>" style = "strike { background-color: #d9d9d9; color: #000000; }" %] [% PROCESS depthControlToolbar %] [%# Display the tree of bugs that this bug depends on. %] -<h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> depends on</h3> +<h3>[% hide_resolved ? "Open $terms.bugs" : "$terms.Bugs" %] + that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] [% bugid %]</a> depends on</h3> [% IF dependson_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] - <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as bug list</a> + <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as [% terms.bug %] list</a> [% IF canedit && dependson_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]&tweak=1">change several</a> [% END %]) @@ -45,11 +48,12 @@ [% END %] [%# Display the tree of bugs that this bug blocks. %] -<h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> blocks</h3> +<h3>[% hide_resolved ? "Open $terms.bugs" : "$terms.Bugs" %] + that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] [% bugid %]</a> blocks</h3> [% IF blocked_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] - <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as bug list</a> + <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as [% terms.bug %] list</a> [% IF canedit && blocked_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&tweak=1">change several</a> [% END %]) @@ -75,16 +79,16 @@ [% dep = tree.$dep_id %] <li> [% "<strike>" IF !dep.open %] - <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] + <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %] - [% dep.assignee_email FILTER html %]] - + [% dep.assignee_email FILTER html %]] - [% IF dep.seen %] - <i>This bug appears elsewhere in this tree.</i></a> + <i>This [% terms.bug %] appears elsewhere in this tree.</i></a> [% ELSE %] [% dep.summary FILTER html %].</a> [% END %] [% "</strike>" IF !dep.open %] - [% INCLUDE display_tree bug_id=dep_id + [% INCLUDE display_tree bug_id=dep_id IF dep.dependencies.size > 0 && !dep.seen %] </li> [% END %] @@ -101,7 +105,7 @@ [%# Hide/show resolved button Swaps text depending on the state of hide_resolved %] <td align="center"> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> <input name="id" type="hidden" value="[% bugid %]"> [% IF maxdepth %] @@ -124,7 +128,7 @@ <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# set to one form %] - <input type="submit" value=" 1 " [% + <input type="submit" value=" 1 " [% realdepth < 2 || maxdepth == 1 ? "disabled" : "" %]> <input name="id" type="hidden" value="[% bugid %]"> @@ -134,28 +138,28 @@ </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> - [%# Minus one form + [%# Minus one form Allow subtracting only when realdepth and maxdepth > 1 %] <input name="id" type="hidden" value="[% bugid %]"> - <input name="maxdepth" type="hidden" value="[% - maxdepth == 1 ? 1 + <input name="maxdepth" type="hidden" value="[% + maxdepth == 1 ? 1 : ( maxdepth ? maxdepth - 1 : realdepth - 1 ) %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> <input type="submit" value=" < " [% - realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : "" + realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : "" %]> </form> </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Limit entry form: the button can not do anything when total depth is less than two, so disable it %] - <input name="maxdepth" size="4" maxlength="4" value="[% + <input name="maxdepth" size="4" maxlength="4" value="[% maxdepth > 0 && maxdepth <= realdepth ? maxdepth : "" %]"> <input name="id" type="hidden" value="[% bugid %]"> @@ -167,16 +171,16 @@ </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> - [%# plus one form + [%# plus one form Disable button if total depth < 2, or if depth set to unlimited %] <input name="id" type="hidden" value="[% bugid %]"> [% IF maxdepth %] <input name="maxdepth" type="hidden" value="[% maxdepth + 1 %]"> [% END %] <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" value=" > " [% + <input type="submit" value=" > " [% realdepth < 2 || ! maxdepth || maxdepth >= realdepth ? "disabled" : "" %]> @@ -184,12 +188,12 @@ </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Unlimited button %] <input name="id" type="hidden" value="[% bugid %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" value=" Unlimited " + <input type="submit" value=" Unlimited " [% maxdepth == 0 || maxdepth == realdepth ? "disabled" : "" %]> </form> </td> diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 6d512e1fd..259362074 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -17,9 +17,11 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <gerv@gerv.net> - # Vaskin Kissoyan <vkissoyan@yahoo.com> + # Vaskin Kissoyan <vkissoyan@yahoo.com> #%] +[% PROCESS global/variables.none.tmpl %] + [% PROCESS bug/time.html.tmpl %] [% IF UserInGroup(Param('timetrackinggroup')) %] @@ -33,7 +35,7 @@ new_time = fRemainingTime - document.changeform.work_time.value; // get upto 2 decimal places - document.changeform.remaining_time.value = + document.changeform.remaining_time.value = Math.round(new_time * 100)/100; } @@ -55,42 +57,42 @@ [%# *** Hardware Reporter Product OS AddCC *** %] <table cellspacing="1" cellpadding="1" border="0"> - <tr> + <tr> <td align="right"> - <b>Bug#:</b> + <b>[% terms.Bug %]#:</b> </td> <td> <a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]"> [% bug.bug_id %]</a> [% IF Param("usebugaliases") %] - <label title="a name for the bug that can be used in place of its ID number, f.e. when adding it to a list of dependencies"> + <label title="a name for the [% terms.bug %] that can be used in place of its ID number, f.e. when adding it to a list of dependencies"> <b>alias:</b> <input name="alias" value="[% bug.alias FILTER html %]" size="20" maxlength="20"> </label> [% END %] </td> - + <td> </td> <td align="right"> <b><u>H</u>ardware:</b> </td> [% PROCESS select selname => "rep_platform" accesskey => "h" %] - + <td align="right"> <b>Reporter:</b> </td> <td> [% bug.reporter.identity FILTER html %] - </td> + </td> </tr> - + <tr> <td align="right"> <b><u>P</u>roduct:</b> </td> [% PROCESS select selname => "product" accesskey => "p" %] - + <td align="right"> <b><u>O</u>S:</b> </td> @@ -104,7 +106,7 @@ </td> </tr> -[%# *** Component Version CC Priority Severity AssignedTo Milestone *** %] +[%# *** Component Version CC Priority Severity AssignedTo Milestone *** %] <tr> <td align="right"> @@ -114,16 +116,16 @@ </b> </td> [% PROCESS select selname => "component" accesskey => "m" %] - + <td align="right"> <b><u>V</u>ersion:</b> </td> [% PROCESS select selname => "version" accesskey => "v" %] - + <td rowspan="4" align="right" valign="top"> <b>CC:</b> </td> - <td rowspan="4" valign="top"> + <td rowspan="4" valign="top"> [% IF bug.cc %] <select name="cc" multiple="multiple" size="5"> [% FOREACH c = bug.cc %] @@ -138,22 +140,22 @@ [% END %] </td> </tr> - + <tr> <td align="right"> <b> <a href="bug_status.html">Status</a>: </b> </td> - <td>[% bug.bug_status FILTER html %]</td> + <td>[% bug.bug_status FILTER html %]</td> <td> </td> - + <td align="right"> <b><a href="bug_status.html#priority">Pr<u>i</u>ority</a>:</b> </td> [% PROCESS select selname => "priority" accesskey => "i" %] </tr> - + <tr> <td align="right"> <b> @@ -163,18 +165,18 @@ <td> [% bug.resolution FILTER html %] [% IF bug.resolution == "DUPLICATE" %] - of [% "bug ${bug.dup_id}" FILTER bug_link(bug.dup_id) %] + of [% terms.bug %] [% "${bug.dup_id}" FILTER bug_link(bug.dup_id) %] [% END %] - </td> + </td> <td> </td> - + <td align="right"> <b><a href="bug_status.html#severity">S<u>e</u>verity</a>:</b> </td> [% PROCESS select selname = "bug_severity" accesskey => "e" %] - + </tr> - + <tr> <td align="right"> <b> @@ -183,7 +185,7 @@ </td> <td>[% bug.assigned_to.identity FILTER html %]</td> <td> </td> - + [% IF Param("usetargetmilestone") && bug.target_milestone %] <td align="right"> <b> @@ -228,7 +230,7 @@ <input name="bug_file_loc" accesskey="u" value="[% bug.bug_file_loc FILTER html %]" size="60"> </td> - <td rowspan="4" colspan="2" valign="top"> + <td rowspan="4" colspan="2" valign="top"> [% IF bug.flag_types.size > 0 %] [% PROCESS "flag/list.html.tmpl" flag_types = bug.flag_types @@ -236,7 +238,7 @@ [% END %] </td> </tr> - + <tr> <td align="right"> <b><u>S</u>ummary:</b> @@ -247,7 +249,7 @@ </td> </tr> - [% IF Param('usestatuswhiteboard') %] + [% IF Param('usestatuswhiteboard') %] <tr> <td align="right"> <b>Status <u>W</u>hiteboard:</b> @@ -269,7 +271,7 @@ <input name="keywords" accesskey="k" value="[% bug.keywords.join(', ') FILTER html %]" size="60"> </td> - </tr> + </tr> [% END %] </table> @@ -299,16 +301,16 @@ <tr> <td align="center"> <input name="estimated_time" - value="[% PROCESS formattimeunit + value="[% PROCESS formattimeunit time_unit=bug.estimated_time %]" size="6" maxlength="6"> </td> <td align="center"> - [% PROCESS formattimeunit + [% PROCESS formattimeunit time_unit=(bug.actual_time + bug.remaining_time) %] </td> <td align="center"> - [% PROCESS formattimeunit time_unit=bug.actual_time %] + + [% PROCESS formattimeunit time_unit=bug.actual_time %] + <input name="work_time" value="0" size="3" maxlength="6" onchange="adjustRemainingTime();"> </td> @@ -328,11 +330,11 @@ </tr> </table> [% END %] - + [%# *** Attachments *** %] - [% PROCESS attachment/list.html.tmpl - attachments = bug.attachments + [% PROCESS attachment/list.html.tmpl + attachments = bug.attachments bugid = bug.bug_id num_attachment_flag_types = bug.num_attachment_flag_types show_attachment_flags = bug.show_attachment_flags @@ -345,12 +347,12 @@ [% PROCESS dependencies accesskey = "d" dep = { title => "<u>d</u>epends on", fieldname => "dependson" } %] <td rowspan="2"> - <a href="showdependencytree.cgi?id=[% bug.bug_id %]">Show - dependency tree</a> + <a href="showdependencytree.cgi?id=[% bug.bug_id %]">Show + dependency tree</a> - [% IF Param('webdotbase') %] + [% IF Param('webdotbase') %] <br> - <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">Show + <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">Show dependency graph</a> [% END %] </td> @@ -370,10 +372,10 @@ </th> <td> [% bug.votes %] - <a href="votes.cgi?action=show_bug&bug_id=[% bug.bug_id %]">Show - votes for this bug</a> - <a href="votes.cgi?action=show_user&bug_id=[% bug.bug_id %]">Vote - for this bug</a> + <a href="votes.cgi?action=show_bug&bug_id=[% bug.bug_id %]">Show + votes for this [% terms.bug %]</a> + <a href="votes.cgi?action=show_user&bug_id=[% bug.bug_id %]">Vote + for this [% terms.bug %]</a> </td> </tr> </table> @@ -402,17 +404,17 @@ [% IF NOT emitted_description %] [% emitted_description = 1 %] <br> - <b>Only users in all of the selected groups can view this bug:</b> + <b>Only users in all of the selected groups can view this [% terms.bug %]:</b> <br> <font size="-1"> - (Unchecking all boxes makes this a more public bug.) + (Unchecking all boxes makes this a more public [% terms.bug %].) </font> <br> <br> [% END %] - <input type="checkbox" name="bit-[% group.bit %]" value="1" + <input type="checkbox" name="bit-[% group.bit %]" value="1" [% " checked=\"checked\"" IF group.ison %] [% " disabled=\"disabled\"" IF NOT group.ingroup %]> [% group.description %] @@ -422,7 +424,7 @@ [% IF NOT inallgroups %] <b> - Only members of a group can change the visibility of a bug for + Only members of a group can change the visibility of [% terms.abug %] for that group </b> <br> @@ -430,15 +432,15 @@ [% IF inagroup %] <p> - <b>Users in the roles selected below can always view this bug:</b> + <b>Users in the roles selected below can always view this [% terms.bug %]:</b> <br> <small> - (The assignee + (The assignee [% IF (Param('useqacontact')) %] and QA contact [% END %] - can always see a bug, and this section does not take effect unless - the bug is restricted to at least one group.) + can always see [% terms.abug %], and this section does not take effect unless + the [% terms.bug %] is restricted to at least one group.) </small> </p> @@ -447,7 +449,7 @@ [% " checked" IF bug.reporter_accessible %]>Reporter <input type="checkbox" name="cclist_accessible" value="1" [% " checked" IF bug.cclist_accessible %]>CC List - </p> + </p> [% END %] [% END %] @@ -461,10 +463,10 @@ [% knum = 1 %] - [% IF bug.bug_status == "UNCONFIRMED" && + [% IF bug.bug_status == "UNCONFIRMED" && bug.user.canconfirm %] <input type="radio" name="knob" value="confirm"> - Confirm bug (change status to <b>NEW</b>) + Confirm [% terms.bug %] (change status to <b>NEW</b>) <br> [% knum = knum + 1 %] [% END %] @@ -473,8 +475,8 @@ [% IF bug.isopened %] [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %] <input type="radio" name="knob" value="accept"> - Accept bug ( - [% "confirm bug, " IF bug.isunconfirmed %]change + Accept [% terms.bug %] ( + [% IF bug.isunconfirmed %]confirm [% terms.bug %], [% END %]change status to <b>ASSIGNED</b>) <br> [% knum = knum + 1 %] @@ -483,13 +485,13 @@ [% IF bug.resolution %] <input type="radio" name="knob" value="clearresolution"> Clear the resolution (remove the current resolution of - <b>[% bug.resolution FILTER html %]</b>)<br> + <b>[% bug.resolution FILTER html %]</b>)<br> [% knum = knum + 1 %] [% END %] <input type="radio" name="knob" value="resolve"> - Resolve bug, changing <a href="bug_status.html">resolution</a> to - <select name="resolution" + Resolve [% terms.bug %], changing <a href="bug_status.html">resolution</a> to + <select name="resolution" onchange="document.changeform.knob[[% knum %]].checked=true"> [% FOREACH r = bug.choices.resolution %] <option value="[% r FILTER html %]">[% r FILTER html %]</option> @@ -499,66 +501,66 @@ [% knum = knum + 1 %] <input type="radio" name="knob" value="duplicate"> - Resolve bug, mark it as duplicate of bug # - <input name="dup_id" size="6" + Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # + <input name="dup_id" size="6" onchange="if (this.value != '') {document.changeform.knob[[% knum %]].checked=true}"> <br> [% knum = knum + 1 %] - <input type="radio" name="knob" value="reassign"> - <a href="bug_status.html#assigned_to">Reassign</a> bug to - <input name="assigned_to" size="32" - onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') && + <input type="radio" name="knob" value="reassign"> + <a href="bug_status.html#assigned_to">Reassign</a> [% terms.bug %] to + <input name="assigned_to" size="32" + onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') && (this.value != '')) { - document.changeform.knob[[% knum %]].checked=true; - }" + document.changeform.knob[[% knum %]].checked=true; + }" value="[% bug.assigned_to.email FILTER html %]"> <br> [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" name="andconfirm"> - and confirm bug (change status to <b>NEW</b>) + and confirm [% terms.bug %] (change status to <b>NEW</b>) <br> [% END %] [% knum = knum + 1 %] <input type="radio" name="knob" value="reassignbycomponent"> - Reassign bug to owner + Reassign [% terms.bug %] to owner [% " and QA contact" IF Param('useqacontact') %] of selected component <br> [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" name="compconfirm"> - and confirm bug (change status to <b>NEW</b>) + and confirm [% terms.bug %] (change status to <b>NEW</b>) <br> [% END %] [% knum = knum + 1 %] [% ELSE %] [% IF bug.resolution != "MOVED" || - (bug.resolution == "MOVED" && bug.user.canmove) %] - <input type="radio" name="knob" value="reopen"> Reopen bug + (bug.resolution == "MOVED" && bug.user.canmove) %] + <input type="radio" name="knob" value="reopen"> Reopen [% terms.bug %] <br> [% knum = knum + 1 %] [% END %] [% IF bug.bug_status == "RESOLVED" %] <input type="radio" name="knob" value="verify"> - Mark bug as <b>VERIFIED</b><br> + Mark [% terms.bug %] as <b>VERIFIED</b><br> [% knum = knum + 1 %] [% END %] [% IF bug.bug_status != "CLOSED" %] <input type="radio" name="knob" value="close"> - Mark bug as <b>CLOSED</b><br> + Mark [% terms.bug %] as <b>CLOSED</b><br> [% knum = knum + 1 %] [% END %] [% END %] - [% END %] - + [% END %] + <input type="submit" value="Commit"> <input type="hidden" name="form_name" value="process_bug"> <p> <font size="+1"> <b> - <a href="show_activity.cgi?id=[% bug.bug_id %]">View Bug Activity</a> + <a href="show_activity.cgi?id=[% bug.bug_id %]">View [% terms.Bug %] Activity</a> | <a href="long_list.cgi?buglist=[% bug.bug_id %]">Format For Printing</a> </b> @@ -566,10 +568,10 @@ [% IF bug.user.canmove %] <font size="+1"><b> | </b></font> - <input type="submit" name="action" + <input type="submit" name="action" value="[% Param("move-button-text") %]"> [% END %] - </p> + </p> [%# *** Additional Comments *** %] @@ -587,11 +589,11 @@ </table> <hr> -[% PROCESS bug/comments.html.tmpl - comments = bug.longdescs +[% PROCESS bug/comments.html.tmpl + comments = bug.longdescs mode = "edit" %] - + </form> [%############################################################################%] @@ -599,7 +601,7 @@ [%############################################################################%] [% BLOCK dependencies %] - <th align="right">Bug [% bug.bug_id %] [%+ dep.title %]:</th> + <th align="right">[% terms.Bug %] [% bug.bug_id %] [%+ dep.title %]:</th> <td> [% FOREACH depbug = bug.${dep.fieldname} %] [% depbug FILTER bug_link(depbug) %][% " " %] @@ -616,7 +618,7 @@ [%# Block for SELECT fields #%] [%############################################################################%] -[% BLOCK select %] +[% BLOCK select %] <td> <label for="[% selname %]" accesskey="[% accesskey %]"> <select name="[% selname %]" id="[% selname %]"> diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index c8636e098..a19779e4f 100644 --- a/template/en/default/bug/navigate.html.tmpl +++ b/template/en/default/bug/navigate.html.tmpl @@ -18,18 +18,20 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> #%] - + +[% PROCESS global/variables.none.tmpl %] + [% IF bug_list && bug_list.size > 0 %] [% this_bug_idx = lsearch(bug_list, bug.bug_id) %] - <b>Bug List:</b> + <b>[% terms.Bug %] List:</b> [% IF this_bug_idx != -1 %] ([% this_bug_idx + 1 %] of [% bug_list.size %]) [% END %] - + <a href="show_bug.cgi?id=[% bug_list.first %]">First</a> <a href="show_bug.cgi?id=[% bug_list.last %]">Last</a> - [% IF bug.bug_id %] + [% IF bug.bug_id %] [% IF this_bug_idx != -1 %] [% IF this_bug_idx > 0 %] [% prev_bug = this_bug_idx - 1 %] @@ -37,7 +39,7 @@ [% ELSE %] <i><font color="#777777">Prev</font></i> [% END %] - + [% IF this_bug_idx + 1 < bug_list.size %] [% next_bug = this_bug_idx + 1 %] <a href="show_bug.cgi?id=[% bug_list.$next_bug %]">Next</a> @@ -45,14 +47,14 @@ <i><font color="#777777">Next</font></i> [% END %] [% ELSE %] - (This bug is not in your list) + (This [% terms.bug %] is not in your list) [% END %] [% ELSE %] [% END %] - + <a href="buglist.cgi?regetlastlist=1">Show list</a> [% END %] <a href="query.cgi">Query page</a> - <a href="enter_bug.cgi">Enter new bug</a> + <a href="enter_bug.cgi">Enter new [% terms.bug %]</a> diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl index 5445ef9cd..631842a40 100644 --- a/template/en/default/bug/process/bugmail.html.tmpl +++ b/template/en/default/bug/process/bugmail.html.tmpl @@ -22,20 +22,22 @@ [%# INTERFACE: # mailing_bugid: string. ID of the bug this mail is concerning. - # mailrecipients: hash. People involved in this change. Hash has up to five + # mailrecipients: hash. People involved in this change. Hash has up to five # elements: - # changer: string. The login name of the user who made the + # changer: string. The login name of the user who made the # change. # # For bug changes where people need to be notified: # owner: string. The login name of the bug assignee. # reporter: string. The login name of the bug reporter. - # qacontact: string. The login name of the bug's QA contact. + # qacontact: string. The login name of the bug's QA contact. # Optional. - # cc: list of strings. The login names of those on the CC + # cc: list of strings. The login names of those on the CC # list. #%] +[% PROCESS global/variables.none.tmpl %] + [% mail = SendBugMail(mailing_bugid, mailrecipients) %] [% PROCESS emails @@ -49,7 +51,7 @@ %] <br> <center> - If you wish to tweak the kinds of mail Bugzilla sends you, you can + If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can <a href="userprefs.cgi?tab=email">change your preferences</a>. </center> @@ -62,7 +64,7 @@ <b>[% description %]:</b> [% IF names.size > 0 %] [%+ FOREACH name = names %] - [% name %][% ", " UNLESS loop.last() %] + [% name %][% ", " UNLESS loop.last() %] [% END %] [% ELSE %] no one diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl index 72472a83b..e7c030309 100644 --- a/template/en/default/bug/process/confirm-duplicate.html.tmpl +++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl @@ -26,45 +26,47 @@ # against which a bug is being duped # duplicate_bug_id: number; the bug number for the bug # being duped - # cclist_accessible: boolean; whether or not users on the cc: list + # cclist_accessible: boolean; whether or not users on the cc: list # of the original bug can access that bug. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title="Duplicate Warning" %] - + <p> - When marking a bug as a duplicate, the reporter of the duplicate - is normally added to the CC list of the original. The permissions - on bug [% original_bug_id %] (the original) are currently set + When marking [% terms.abug %] as a duplicate, the reporter of the duplicate + is normally added to the CC list of the original. The permissions + on [% terms.bug %] [% original_bug_id %] (the original) are currently set such that the reporter would not normally be able to see it. </p> <p> - <b>Adding the reporter to the CC list of bug [% original_bug_id %] + <b>Adding the reporter to the CC list of [% terms.bug %] [% original_bug_id %] [% IF cclist_accessible %] will immediately [% ELSE %] might, in the future, [% END %] - allow him/her access to view this bug.</b> + allow him/her access to view this [% terms.bug %].</b> Do you wish to do this? </p> - + <form method="post" action="process_bug.cgi"> [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] <p> - <input type="radio" name="confirm_add_duplicate" value="1"> - Yes, add the reporter to CC list on bug [% original_bug_id %] + <input type="radio" name="confirm_add_duplicate" value="1"> + Yes, add the reporter to CC list on [% terms.bug %] [% original_bug_id %] </p> <p> - <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> - No, do not add the reporter to CC list on bug [% original_bug_id %] + <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> + No, do not add the reporter to CC list on [% terms.bug %] [% original_bug_id %] </p> <p> - <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, - and revisit bug [% duplicate_bug_id %]</a> + <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, + and revisit [% terms.bug %] [% duplicate_bug_id %]</a> <p> <input type="submit" value="Submit"> </p> diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl index 08e27ec56..9c2f1fad7 100644 --- a/template/en/default/bug/process/header.html.tmpl +++ b/template/en/default/bug/process/header.html.tmpl @@ -22,11 +22,13 @@ [%# INTERFACE: # As global/header.html.tmpl. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% IF title_tag == "bug_processed" %] - [% title = "Bug processed" %] + [% title = "$terms.Bug processed" %] [% ELSIF title_tag == "mid_air" %] [% title = "Mid-air collision!" %] [% END %] - + [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index e3698a640..f8b198689 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -33,7 +33,9 @@ # comments: array; all the comments on the bug. # bug_id: number; the ID of the bug being changed. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% UNLESS header_done %] [% PROCESS bug/process/header.html.tmpl %] [% END %] @@ -41,14 +43,14 @@ <h1>Mid-air collision detected!</h1> <p> - Someone else has made changes to this bug at the same time you were trying to. + Someone else has made changes to this [% terms.bug %] at the same time you were trying to. The changes made were: </p> <p> [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %] </p> - + [% IF comments.size > start_at %] <p> Added comments: @@ -72,8 +74,8 @@ You have the following choices: </form> </li> <li> - <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, - and revisit bug [% bug_id %]</a> + <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, + and revisit [% terms.bug %] [% bug_id %]</a> </li> </ul> diff --git a/template/en/default/bug/process/next.html.tmpl b/template/en/default/bug/process/next.html.tmpl index 1eeb9f367..73c8b5289 100644 --- a/template/en/default/bug/process/next.html.tmpl +++ b/template/en/default/bug/process/next.html.tmpl @@ -23,10 +23,12 @@ # bug : Bug object; the next bug to show #%] +[% PROCESS global/variables.none.tmpl %] + <hr> <p> - The next bug in your list is bug + The next [% terms.bug %] in your list is [% terms.bug %] <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>: </p> diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl index 5c3592954..2097e047b 100644 --- a/template/en/default/bug/process/results.html.tmpl +++ b/template/en/default/bug/process/results.html.tmpl @@ -25,24 +25,26 @@ # type: string; the type of change/check that was made: "bug" when a bug # is changed, "dupe" when a duplication notation is added to a bug, # and "dep" when a bug is checked for changes to its dependencies. - # + # # mailrecipients: hash; BugMail recipient params. Optional. #%] +[% PROCESS global/variables.none.tmpl %] + [% UNLESS header_done %] [% PROCESS bug/process/header.html.tmpl %] [% END %] [% DEFAULT type="bug" %] -[% +[% title = { - 'bug' => "Changes submitted for bug $id" , - 'dupe' => "Duplicate notation added to bug $id" , - 'dep' => "Checking for dependency changes on bug $id" , - 'votes' => "Bug $id confirmed by number of votes" , - 'created' => "Bug $id has been added to the database" , - } + 'bug' => "Changes submitted for $terms.bug $id" , + 'dupe' => "Duplicate notation added to $terms.bug $id" , + 'dep' => "Checking for dependency changes on $terms.bug $id" , + 'votes' => "$terms.Bug $id confirmed by number of votes" , + 'created' => "$terms.Bug $id has been added to the database" , + } %] <table border="1"> @@ -52,7 +54,7 @@ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] </td> <td> - <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a> + <a href="show_bug.cgi?id=[% id %]">Back To [% terms.Bug %]# [% id %]</a> </td> </tr> </table> diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl index bba85d637..fd37707dc 100644 --- a/template/en/default/bug/process/verify-new-product.html.tmpl +++ b/template/en/default/bug/process/verify-new-product.html.tmpl @@ -22,7 +22,7 @@ [%# INTERFACE: # form: hash; the form values submitted to the script # mform: hash; the form multi-values submitted to the script - # verify_fields: boolean; whether or not to verify + # verify_fields: boolean; whether or not to verify # the version, component, and target milestone fields # versions: array; versions for the new product. # components: array; components for the new product. @@ -31,13 +31,15 @@ # those fields # verify_bug_group: boolean; whether or not to ask the user # if they want to add the bug to its new product's group - # use_target_milestone: boolean; whether or not to use + # use_target_milestone: boolean; whether or not to use # the target milestone field #%] - + +[% PROCESS global/variables.none.tmpl %] + <form action="process_bug.cgi" method="post"> -[% PROCESS "global/hidden-fields.html.tmpl" +[% PROCESS "global/hidden-fields.html.tmpl" exclude=(verify_fields ? "^version|component|target_milestone$" : "") %] [%# Verify the version, component, and target milestone fields. %] @@ -46,12 +48,12 @@ <p> [% IF use_target_milestone %] - You are moving the bug(s) to the product <b>[% form.product %]</b>, + You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>, and the version, component, and/or target milestone fields are no longer correct. Please set the correct version, component, and target milestone now: [% ELSE %] - You are moving the bug(s) to the product <b>[% form.product %]</b>, - and the version and component fields are no longer correct. + You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>, + and the version and component fields are no longer correct. Please set the correct version and component now: [% END %] <p> @@ -76,19 +78,19 @@ </table> [% END %] - + [% IF verify_bug_group %] - <h3>Verify Bug Group</h3> + <h3>Verify [% terms.Bug %] Group</h3> <p> - Do you want to add the bug to its new product's default groups (if any)? + Do you want to add the [% terms.bug %] to its new product's default groups (if any)? </p> <p> <input type="radio" name="addtonewgroup" value="no"><b>no</b><br> <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br> <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked"> - <b>yes, but only if the bug was in any of its old product's default groups</b><br> + <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br> </p> [% END %] diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 41d824eb3..8bf02a099 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -20,8 +20,10 @@ # Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/header.html.tmpl - title = "Full Text Bug Listing" +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Full Text $terms.Bug Listing" style_urls = [ "css/show_multiple.css" ] %] [% PROCESS bug/time.html.tmpl %] @@ -31,7 +33,7 @@ [% END %] [% ELSE %] <p> - You'd have more luck if you gave me some bug numbers. + You'd have more luck if you gave me some [% terms.bug %] numbers. </p> [% END %] @@ -47,54 +49,54 @@ <img alt="" src="1x1.gif" width="1" height="80" align="left"> <div align="center"> <b> - <font size="+3">Bug [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font> + <font size="+3">[% terms.Bug %] [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font> </b> </div> <table width="100%"> <tr> <td> - <b>Bug#:</b> + <b>[% terms.Bug %]#:</b> <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> </td> - [% PROCESS cell attr = { description => "Product", + [% PROCESS cell attr = { description => "Product", name => "product" } %] - [% PROCESS cell attr = { description => "Version", + [% PROCESS cell attr = { description => "Version", name => "version" } %] - [% PROCESS cell attr = { description => "Platform", + [% PROCESS cell attr = { description => "Platform", name => "rep_platform" } %] </tr> - + <tr> - [% PROCESS cell attr = { description => "OS/Version", + [% PROCESS cell attr = { description => "OS/Version", name => "op_sys" } %] - [% PROCESS cell attr = { description => "Status", + [% PROCESS cell attr = { description => "Status", name => "bug_status" } %] - [% PROCESS cell attr = { description => "Severity", + [% PROCESS cell attr = { description => "Severity", name => "bug_severity" } %] - [% PROCESS cell attr = { description => "Priority", + [% PROCESS cell attr = { description => "Priority", name => "priority" } %] </tr> - + <tr> - [% PROCESS cell attr = { description => "Resolution", + [% PROCESS cell attr = { description => "Resolution", name => "resolution" } %] - [% PROCESS cell attr = { description => "Assigned To", + [% PROCESS cell attr = { description => "Assigned To", name => "assigned_to" } %] - [% PROCESS cell attr = { description => "Reported By", + [% PROCESS cell attr = { description => "Reported By", name => "reporter" } %] [% IF Param('useqacontact') %] - [% PROCESS cell attr = { description => "QA Contact", + [% PROCESS cell attr = { description => "QA Contact", name => "qa_contact" } %] [% END %] </tr> - + <tr> <td colspan="2"> <b>Component:</b> [% bug.component %] </td> - + <td colspan="2"> [% IF Param('usetargetmilestone') %] <b>Target Milestone:</b> @@ -102,20 +104,20 @@ [% END %] </td> </tr> - + <tr> <td colspan="4"> <b>URL:</b> <a href="[% bug.bug_file_loc FILTER html %]"> - [% bug.bug_file_loc FILTER html %]</a> + [% bug.bug_file_loc FILTER html %]</a> </tr> - + <tr> <td colspan="4"> <b>Summary:</b> [% bug.short_desc FILTER html %] </td> </tr> - + [% IF use_keywords %] <tr> <td colspan="4"> @@ -140,7 +142,7 @@ [% PROCESS formattimeunit time_unit=bug.estimated_time %] <b>Current Est.:</b> - [% PROCESS formattimeunit + [% PROCESS formattimeunit time_unit=(bug.remaining_time + bug.actual_time) %] <b>Hours Worked:</b> @@ -149,10 +151,10 @@ [% PROCESS formattimeunit time_unit=bug.remaining_time %] <b>Percentage Complete:</b> - [% PROCESS calculatepercentage act=bug.actual_time + [% PROCESS calculatepercentage act=bug.actual_time rem=bug.remaining_time %] <b>Gain</b> - [% PROCESS formattimeunit + [% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] </td> @@ -172,9 +174,9 @@ </tr> </table> - [% PROCESS bug/comments.html.tmpl + [% PROCESS bug/comments.html.tmpl comments = bug.comments %] - + <hr> [% END %] diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl index 637583502..44b9c72b4 100644 --- a/template/en/default/bug/show.html.tmpl +++ b/template/en/default/bug/show.html.tmpl @@ -21,14 +21,16 @@ # Bradley Baetz <bbaetz@student.usyd.edu.au> #%] +[% PROCESS global/variables.none.tmpl %] + [%# This script/template only handles one bug #%] [% bug = bugs.0 %] [% filtered_desc = bug.short_desc FILTER html %] [% filtered_timestamp = bug.delta_ts FILTER time %] -[% PROCESS global/header.html.tmpl - title = "Bug $bug.bug_id - $bug.short_desc" - h1 = "Bugzilla Bug $bug.bug_id" +[% PROCESS global/header.html.tmpl + title = "$terms.Bug $bug.bug_id - $bug.short_desc" + h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id" h2 = filtered_desc h3 = "Last modified: $filtered_timestamp" style_urls = [ "css/edit_bug.css" ] diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl index c50b0cb1c..d5ebae349 100644 --- a/template/en/default/bug/votes/delete-all.html.tmpl +++ b/template/en/default/bug/votes/delete-all.html.tmpl @@ -20,16 +20,18 @@ #%] [%# INTERFACE: - # This template has no interface. + # This template has no interface. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "Remove your votes?" %] <p> - You are about to remove all of your bug votes. Are you sure you wish to - remove your vote from every bug you've voted on? + You are about to remove all of your [% terms.bug %] votes. Are you sure you wish to + remove your vote from every [% terms.bug %] you've voted on? </p> <form action="votes.cgi" method="post"> diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl index 32a786aa8..b4d1ed586 100644 --- a/template/en/default/bug/votes/list-for-bug.html.tmpl +++ b/template/en/default/bug/votes/list-for-bug.html.tmpl @@ -24,14 +24,16 @@ # users: list of hashes. May be empty. Each hash has two members: # name: string. The login name of the user whose vote is attached # count: integer. The number of times that user has votes for this bug. - # total: integer. The total number of votes for this bug. + # total: integer. The total number of votes for this bug. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "Show Votes" - h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" + h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] - + <table cellspacing="4"> <tr> <th>Who</th> diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl index 0c1e30e6e..bcb5956ea 100644 --- a/template/en/default/bug/votes/list-for-user.html.tmpl +++ b/template/en/default/bug/votes/list-for-user.html.tmpl @@ -19,6 +19,8 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "Show Votes" h2 = voting_user.name @@ -42,7 +44,7 @@ <table cellspacing="4"> <tr> <td></td> - <th>Bug #</th> + <th>[% terms.Bug %] #</th> <th>Summary</th> <th>Votes</th> </tr> @@ -63,7 +65,7 @@ <td> <font size="-1"> (Note: only [% product.maxperbug %] vote - [% "s" IF product.maxperbug != 1 %] allowed per bug in + [% "s" IF product.maxperbug != 1 %] allowed per [% terms.bug %] in this product.) </font> </td> @@ -90,7 +92,7 @@ <input type="checkbox" name="[% bug.id %]" value="1" [% " checked" IF bug.count %]> [% ELSE %] - <input name="[% bug.id %]" value="[% bug.count %]" + <input name="[% bug.id %]" value="[% bug.count %]" size="2"> [% END %] [% ELSE %] @@ -125,7 +127,7 @@ change the checkbox [% END %] and then click <b>Change My Votes</b>. - [% END %] + [% END %] </form> [% ELSE %] <p> @@ -134,7 +136,7 @@ [% ELSE %] This user is [% END %] - currently not voting on any bugs. + currently not voting on any [% terms.bugs %]. </p> [% END %] |