summaryrefslogtreecommitdiffstats
path: root/extensions/BMO
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/BMO')
-rw-r--r--extensions/BMO/lib/FakeBug.pm2
-rw-r--r--extensions/BMO/template/en/default/account/create.html.tmpl10
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl4
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl4
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl3
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl26
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl29
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl4
-rw-r--r--extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl9
-rw-r--r--extensions/BMO/template/en/default/bug/create/user-message.html.tmpl22
-rw-r--r--extensions/BMO/template/en/default/global/choose-product.html.tmpl9
-rw-r--r--extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl2
-rw-r--r--extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl2
-rw-r--r--extensions/BMO/template/en/default/hook/global/header-start.html.tmpl12
-rw-r--r--extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl2
-rw-r--r--extensions/BMO/template/en/default/list/list.microsummary.tmpl2
-rw-r--r--extensions/BMO/template/en/default/list/server-push.html.tmpl2
-rw-r--r--extensions/BMO/template/en/default/pages/etiquette.html.tmpl42
-rw-r--r--extensions/BMO/template/en/default/pages/triage_reports.html.tmpl6
-rw-r--r--extensions/BMO/template/en/default/pages/user_activity.html.tmpl6
20 files changed, 106 insertions, 92 deletions
diff --git a/extensions/BMO/lib/FakeBug.pm b/extensions/BMO/lib/FakeBug.pm
index 5610f5433..6127cb560 100644
--- a/extensions/BMO/lib/FakeBug.pm
+++ b/extensions/BMO/lib/FakeBug.pm
@@ -3,6 +3,8 @@ package Bugzilla::Extension::BMO::FakeBug;
# hack to allow the bug entry templates to use check_can_change_field to see if
# various field values should be available to the current user
+use strict;
+
use Bugzilla::Bug;
our $AUTOLOAD;
diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl
index 47355cf00..275df01f8 100644
--- a/extensions/BMO/template/en/default/account/create.html.tmpl
+++ b/extensions/BMO/template/en/default/account/create.html.tmpl
@@ -122,17 +122,17 @@ function onSubmit() {
<ol>
<li>
Please consider reading our
- <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">bug writing guidelines</a>.
+ <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">[% terms.bug %] writing guidelines</a>.
</li>
<li>
- Bugzilla is a public place, so what you type and your email address will be visible
+ [% terms.Bugzilla %] is a public place, so what you type and your email address will be visible
to all logged-in users. Some people use an
<a href="http://email.about.com/od/freeemailreviews/tp/free_email.htm" target="_blank">alternative email address</a>
for this reason.
</li>
<li>
Please give us an email address you want to use. Once we confirm that it works,
- you'll be asked to set a password and then you can start filing bugs and helping fix them.
+ you'll be asked to set a password and then you can start filing [% terms.bugs %] and helping fix them.
</li>
</ol>
</div>
@@ -158,9 +158,9 @@ function onSubmit() {
</table>
<p id="bmo-admin">
- If you think there's something wrong with Bugzilla, you can
+ If you think there's something wrong with [% terms.Bugzilla %], you can
<a href="mailto:bugzilla-admin@mozilla.org">send an email to the admins</a>, but
- remember, they can't file bugs for you, or solve tech support problems.
+ remember, they can't file [% terms.bugs %] for you, or solve tech support problems.
</p>
[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
index e4c6cabfb..7016477f5 100644
--- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
@@ -89,7 +89,7 @@ function trySubmit() {
<input type="hidden" name="bug_severity" id="bug_severity" value="normal">
<input type="hidden" name="comment" id="comment" value="">
<input type="hidden" name="short_desc" id="short_desc" value="">
- <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+ <input type="hidden" name="groups" value="mozilla-corporation-confidential">
<table>
<tr>
@@ -146,7 +146,7 @@ function trySubmit() {
<option value="AM" selected>AM</option>
<option value="PM">PM</option>
</select>
- </td>
+ </td>
</tr>
<tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
index 08207fd8c..d9b0579ba 100644
--- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
@@ -32,7 +32,7 @@
[% USE Bugzilla %]
<p><strong>Please use this form for IT requests only!</strong></p>
-<p>If you have a bug to file, go <a href="enter_bug.cgi">here</a>.</p>
+<p>If you have a [% terms.bug %] to file, go <a href="enter_bug.cgi">here</a>.</p>
<form method="post" action="post_bug.cgi" id="itRequestForm" enctype="multipart/form-data">
<input type="hidden" name="product" value="mozilla.org">
@@ -172,7 +172,7 @@
</table>
<br>
- <!-- infra bugs -->
+ <!-- infra [% terms.bugs %] -->
<input type="checkbox" name="groups" id="groups" value="infra" checked="checked"><label for="groups"><strong>This is an internal issue which should not be publicly visible.</strong></label><br>(please uncheck this box if it isn't)
<br><br>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
index d6b6c188f..8aaa84678 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
@@ -99,9 +99,8 @@ function validateAndSubmit() {
<input type="hidden" name="priority" value="--">
<input type="hidden" name="version" value="unspecified">
<input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-
<input type="hidden" name="short_desc" id="short_desc" value="">
- <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+ <input type="hidden" name="groups" value="mozilla-corporation-confidential">
<table>
<tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
index 138f1754b..0a2edb5ee 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
@@ -88,21 +88,21 @@
var listName = document.getElementById('listName').value;
var listAdmin = document.getElementById('listAdmin').value;
var listTypeRadio = document.getElementsByName('listType');
- var listType = "";
+ var listType = "";
- for (var i = 0; i < listTypeRadio.length; i++) {
- if (listTypeRadio[i].checked) {
- listType = listTypeRadio[i].value;
- }
- }
+ for (var i = 0; i < listTypeRadio.length; i++) {
+ if (listTypeRadio[i].checked) {
+ listType = listTypeRadio[i].value;
+ }
+ }
var alert_text = "";
var short_desc = "";
- if (listType) {
+ if (listType) {
if (listType == "lists.mozilla.org") {
document.getElementById('component').value = "Discussion Forums";
- short_desc = "Discussion Forum: " + listName;
+ short_desc = "Discussion Forum: " + listName;
} else if (listType == "mozilla.com" ) {
document.getElementById('component').value = "Server Operations: Desktop Issues";
short_desc = "[Zimbra Distribution List Request] " + listName + "@" + listType;
@@ -112,7 +112,7 @@
}
} else {
alert_text += "Please select a list type\n";
- }
+ }
if (!isFilledOut('listName')) {
alert_text += "Please enter the list name\n";
@@ -127,7 +127,7 @@
return false;
}
- document.getElementById('short_desc').value = short_desc;
+ document.getElementById('short_desc').value = short_desc;
return true;
}
@@ -220,8 +220,8 @@
<br>
<b>Note:</b>The list administrator is also initially considered to be the list moderator
and will be responsible for moderation tasks unless delegated to someone else. For
- convenience, Bugzilla user accounts will autocomplete. The administrator is not required
- to have a Bugzilla account, and you can enter an address that doesn't autocomplete if
+ convenience, [% terms.Bugzilla %] user accounts will autocomplete. The administrator is not required
+ to have a [% terms.Bugzilla %] account, and you can enter an address that doesn't autocomplete if
necessary.<hr />
</td>
</tr>
@@ -287,7 +287,7 @@
<br>
<div id="groups" style="display:none;">
- <!-- infra bugs -->
+ <!-- infra [% terms.bugs %] -->
<input type="checkbox" name="groups" id="group_35" value="infra" disabled="true">
<label for="group_35"><strong>This is an internal issue which should not be publicly visible.</strong></label>
<br><br>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index 28a37a31e..a272e0b41 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -299,9 +299,9 @@ TUI_hide_default('expert_fields');
</td>
</tr>
</table>
- <input type="hidden" name="bug_severity" value="[% default.bug_severity %]">
- <input type="hidden" name="rep_platform" value="[% default.rep_platform %]">
- <input type="hidden" name="op_sys" value="[% default.op_sys %]">
+ <input type="hidden" name="bug_severity" value="[% default.bug_severity FILTER html %]">
+ <input type="hidden" name="rep_platform" value="[% default.rep_platform FILTER html %]">
+ <input type="hidden" name="op_sys" value="[% default.op_sys FILTER html %]">
<input type="hidden" name="version" value="unspecified">
</td>
</tr>
@@ -466,7 +466,7 @@ TUI_hide_default('expert_fields');
<td colspan="3">
[% defaultcontent = BLOCK %]
[% IF cloned_bug_id %]
-+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id %] +++
++++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id FILTER html %] +++
[% END %]
@@ -552,7 +552,7 @@ TUI_hide_default('expert_fields');
<th>Status Whiteboard:</th>
<td colspan="3">
<input id="status_whiteboard" name="status_whiteboard" size="70"
- value="[% status_whiteboard %]">
+ value="[% status_whiteboard FILTER html %]">
</td>
</tr>
<tr>
@@ -571,13 +571,14 @@ TUI_hide_default('expert_fields');
</tbody>
<tbody class="expert_fields">
- [% IF group.size %]
+ [% IF product.groups_available.size %]
<tr>
<th>&nbsp;</th>
<td colspan="3">
<br>
<strong>
- Only users in all of the selected groups can view this [% terms.bug %]:
+ Only users in all of the selected groups can view this
+ [%+ terms.bug %]:
</strong>
<br>
<font size="-1">
@@ -587,12 +588,14 @@ TUI_hide_default('expert_fields');
<br>
<!-- Checkboxes -->
- [% FOREACH g = group %]
- &nbsp;&nbsp;&nbsp;&nbsp;
- <input type="checkbox" id="bit-[% g.bit %]"
- name="bit-[% g.bit %]" value="1"
- [% " checked=\"checked\"" IF g.checked %]>
- <label for="bit-[% g.bit %]">[% g.description FILTER html_light %]</label><br>
+ <input type="hidden" name="defined_groups" value="1">
+ [% FOREACH group = product.groups_available %]
+ <input type="checkbox" id="group_[% group.id FILTER html %]"
+ name="groups" value="[% group.name FILTER html %]"
+ [% ' checked="checked"' IF default.groups.contains(group.name)
+ OR group.is_default %]>
+ <label for="group_[% group.id FILTER html %]">
+ [%- group.description FILTER html_light %]</label><br>
[% END %]
</td>
</tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
index cdbce5c8c..b28a81004 100644
--- a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
@@ -86,7 +86,7 @@ function trySubmit() {
<input type="hidden" name="bug_severity" id="bug_severity" value="normal">
<input type="hidden" name="comment" id="comment" value="">
<input type="hidden" name="short_desc" id="short_desc" value="">
- <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+ <input type="hidden" name="groups" value="mozilla-corporation-confidential">
<table>
<tr>
@@ -142,7 +142,7 @@ function trySubmit() {
<option value="AM" selected>AM</option>
<option value="PM">PM</option>
</select>
- </td>
+ </td>
</tr>
<tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
index f7edccbe1..2b47f60c5 100644
--- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
@@ -34,7 +34,7 @@
<p><strong>Swag Request:</strong> Please use this form to file a request for swag. </p>
<ol>
- <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>. You'll be asked for the bug number below.</li>
+ <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>. You'll be asked for the [% terms.bug %] number below.</li>
<li>Complete and submit request below.</li>
<li>Your request will be reviewed by the appropriate person in the Engagement team.</li>
<li>Your swag request will be reviewed and if approved shipped to you from
@@ -70,7 +70,7 @@ function validateAndSubmit() {
var alert_text = '';
if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
- if(!isFilledOut('dependson')) alert_text += "Please enter the bug number for your Event Request Form\n";
+ if(!isFilledOut('dependson')) alert_text += "Please enter the [% terms.bug %] number for your Event Request Form\n";
if(!isValidEmail(document.getElementById('email').value)) alert_text += "Please enter a valid email address\n";
//Everything required is filled out..try to submit the form!
@@ -96,9 +96,8 @@ function validateAndSubmit() {
<input type="hidden" name="priority" value="--">
<input type="hidden" name="version" value="unspecified">
<input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-
<input type="hidden" name="short_desc" id="short_desc" value="">
- <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+ <input type="hidden" name="groups" value="mozilla-corporation-confidential">
<table>
<tr>
@@ -143,7 +142,7 @@ function validateAndSubmit() {
</tr>
<tr>
- <td align="right"><strong>Bug number assigned to previously- &nbsp;&nbsp;<br>submitted <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td>
+ <td align="right"><strong>[% terms.Bug %] number assigned to previously- &nbsp;&nbsp;<br>submitted <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td>
<td colspan="3"><input name="dependson" id="dependson"></td>
</tr>
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index e7cea5d2b..fdc4b5f0c 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -62,9 +62,9 @@ the <a href="https://bugzilla.mozilla.org/enter_bug.cgi">full product list</a>.
<p>
<b>The product you have chosen is for [% terms.bug %] reports and enhancement requests for the
-<a href="http://www.bugzilla.org/">Bugzilla [% terms.bug %] tracking software</a> only.</b>
-If your [% terms.bug %] is not reporting that Bugzilla is broken or that you'd like
-a new feature in Bugzilla, your [% terms.bug %] report does not belong in this product.
+<a href="http://www.bugzilla.org/">[% terms.Bugzilla +%] [%+ terms.bug %] tracking software</a> only.</b>
+If your [% terms.bug %] is not reporting that [% terms.Bugzilla %] is broken or that you'd like
+a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belong in this product.
[% IF format == "guided" %]
See the instructions next to the stop sign above.
[% ELSE %]
@@ -72,22 +72,22 @@ a new feature in Bugzilla, your [% terms.bug %] report does not belong in this p
[% END %]
</p>
-<p><b>We WILL NOT accept [% terms.bug %] reports for Bugzilla
-installed via the Debian packaging system. If you obtained Bugzilla from Debian,
+<p><b>We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %]
+installed via the Debian packaging system. If you obtained [% terms.Bugzilla %] from Debian,
please visit the <a href="http://www.debian.org/support">Debian Support page</a>,
-or file a bug on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
-Bug Tracker</a>.</b> The Debian package maintainer will then determine whether the bug
-is specific to the package or not, and can move the bug "upstream" if needed.</p>
+or file a [% terms.bug %] on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
+[% terms.Bug %] Tracker</a>.</b> The Debian package maintainer will then determine whether the [% terms.bug %]
+is specific to the package or not, and can move the [% terms.bug %] "upstream" if needed.</p>
<p>
-Bugs specific to bugzilla.mozilla.org, rather than the Bugzilla software in
+[% terms.Bugs %] specific to bugzilla.mozilla.org, rather than the [% terms.Bugzilla %] software in
general (which is used by many sites), should be filed in the
<a href="enter_bug.cgi?product=mozilla.org">mozilla.org product</a>.
</p>
<p>
Please do not file test [% terms.bugs %] or support requests here! You
-can test Bugzilla at
+can test [% terms.Bugzilla %] at
<a href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a> and ask
for support in the
<a href="news://news.mozilla.org/mozilla.support.bugzilla">
@@ -106,7 +106,7 @@ support-bugzilla&#64;lists.mozilla.org mailing list</a>, or
[% UNLESS cloned_bug_id %]
Consider using the
<a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided">
-Bugzilla Helper</a> instead of this form.
+[% terms.Bugzilla %] Helper</a> instead of this form.
[% END +%]
Before reporting a [% terms.bug %], make sure you've read our
<a href="http://www.mozilla.org/quality/bug-writing-guidelines.html">
diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index a65605a93..7e0a8dc18 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -42,7 +42,8 @@
<center>
<hr>
-<p><span style="font-family: verdana,helvetica;">Looking for technical support or help getting your site to work with Mozilla? <a href="http://www.mozilla.org/support/">Visit the mozilla.org support page</a> before filing bugs.</span></p>
+<p><span style="font-family: verdana,helvetica;">Looking for technical support or help getting your site to work with Mozilla? <a
+href="http://www.mozilla.org/support/">Visit the mozilla.org support page</a> before filing [% terms.bugs %].</span></p>
<hr>
</center>
@@ -96,12 +97,12 @@
icon="dino.png"
%]
<tr>
- <td><a href="[% target FILTER uri i%]?full=1
+ <td><a href="[% target FILTER uri %]?full=1
[%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
[%- IF classification %]&amp;classification=[% classification FILTER uri %][% END -%]
[%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
<img src="extensions/BMO/web/producticons/other.png" height="64" width="64" border="0"></a></td>
- <td><h2 align="left" style="margin-bottom: 0px;"><a href="[% target FILTER uri i%]?full=1
+ <td><h2 align="left" style="margin-bottom: 0px;"><a href="[% target FILTER uri %]?full=1
[%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
[%- IF classification %]&amp;classification=[% classification FILTER uri %][% END -%]
[%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
@@ -146,7 +147,7 @@
<br>
[% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %]
-<p align="center">You can choose to get this screen by default when you click "New Bug" by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
+<p align="center">You can choose to get this screen by default when you click "New [% terms.Bug %]" by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
[% END %]
[% END %]
<br>
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
index ee88aac7c..a0fff4175 100644
--- a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
@@ -1,4 +1,4 @@
- <tr bgcolor="[% tablecolour %]">
+ <tr bgcolor="[% tablecolour FILTER html %]">
<td valign="middle" align="right">
<b>Security</b>
</td>
diff --git a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
index 0277f3e7e..05276d5f7 100644
--- a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
@@ -21,7 +21,7 @@
<link rel="shortcut icon" href="extensions/BMO/web/images/bugzilla.png">
[% IF bug %]
-<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id %]">
+<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id FILTER uri %]">
[% END %]
<style type="text/css">
diff --git a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
index 3c2f90e19..9c96ebffa 100644
--- a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
@@ -1,3 +1,13 @@
+[% IF !javascript_urls %]
+ [% javascript_urls = [] %]
+[% END %]
+
[% IF template.name == 'list/list.html.tmpl' %]
[% javascript_urls.push('extensions/BMO/web/js/sorttable.js') %]
-[% END %] \ No newline at end of file
+[% END %]
+
+[% IF user.in_group('editusers') || user.bless_groups.size > 0 %]
+ [% yui.push('container', 'menu') %]
+ [% style_urls.push('js/yui/assets/skins/sam/menu.css') %]
+ [% javascript_urls.push('extensions/BMO/web/js/edituser_menu.js') %]
+[% END %]
diff --git a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
index 5f6ca946a..346e02373 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
@@ -22,7 +22,7 @@
[% IF (group == "canconfirm" OR group == "editbugs") AND !reason %]
<p>
- If you are attempting to confirm an unconfirmed bug or edit the fields of a bug,
+ If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %],
<a href="http://www.gerv.net/hacking/before-you-mail-gerv.html#bugzilla-permissions">find
out how to get the necessary permissions</a>.
</p>
diff --git a/extensions/BMO/template/en/default/list/list.microsummary.tmpl b/extensions/BMO/template/en/default/list/list.microsummary.tmpl
index 8f6b13cbd..8925db8dd 100644
--- a/extensions/BMO/template/en/default/list/list.microsummary.tmpl
+++ b/extensions/BMO/template/en/default/list/list.microsummary.tmpl
@@ -23,7 +23,7 @@
[% IF searchname %]
- [% searchname %] ([% bugs.size %])
+ [% searchname FILTER html %] ([% bugs.size %])
[% ELSE %]
[% terms.Bug %] List ([% bugs.size %])
[% END %]
diff --git a/extensions/BMO/template/en/default/list/server-push.html.tmpl b/extensions/BMO/template/en/default/list/server-push.html.tmpl
index 40432a35b..1c1f3cf36 100644
--- a/extensions/BMO/template/en/default/list/server-push.html.tmpl
+++ b/extensions/BMO/template/en/default/list/server-push.html.tmpl
@@ -34,7 +34,7 @@
<div style="margin-top: 15%; text-align: center;">
<center><img src="extensions/BMO/web/images/mozchomp.gif" alt=""
width="160" height="87"></center>
- <h1>Please wait while your bugs are retrieved.</h1>
+ <h1>Please wait while your [% terms.bugs %] are retrieved.</h1>
</div>
[% IF debug %]
diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index 281057eeb..8bccaea9d 100644
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -21,15 +21,15 @@
#%]
[% INCLUDE global/header.html.tmpl
- title = "Bugzilla Etiquette"
+ title = "$terms.Bugzilla Etiquette"
style = "li { margin: 5px } .heading { font-weight: bold }" %]
<p>
There's a number of <i lang="fr">faux pas</i> you can commit when using
- Bugzilla. At the very
+ [% terms.Bugzilla %]. At the very
least, these will make Mozilla contributors upset at you; if committed enough
times they will cause those contributors to demand the disabling of your
- Bugzilla account. So, ignore this advice at your peril.
+ [% terms.Bugzilla %] account. So, ignore this advice at your peril.
</p>
<p>
@@ -47,14 +47,14 @@
<li>
<span class="heading">No pointless comments</span>.
Unless you have something constructive and helpful to say, do not add a
- comment to a bug. In bugs where there is a heated debate going on, you
+ comment to a [% terms.bug %]. In [% terms.bugs %] where there is a heated debate going on, you
should be even more
inclined not to add a comment. Unless you have something new to contribute,
- then the bug owner is aware of all the issues, and will make a judgement
- as to what to do. If you agree the bug should be fixed, vote for it.
+ then the [% terms.bug %] owner is aware of all the issues, and will make a judgement
+ as to what to do. If you agree the [% terms.bug %] should be fixed, vote for it.
Additional "I see this too" or "It works for me" comments are unnecessary
unless they are on a different platform or a significantly different build.
- Constructive and helpful thoughts unrelated to the topic of the bug
+ Constructive and helpful thoughts unrelated to the topic of the [% terms.bug %]
should go in the appropriate
<a href="http://www.mozilla.org/about/forums/">newsgroup</a>.
</li>
@@ -63,8 +63,8 @@
<span class="heading">No obligation</span>.
"Open Source" is not the same as "the developers must do my bidding."
Everyone here wants to help, but the only person who has any
- <i>obligation</i> to fix the bugs you want fixed is you. Therefore, you
- should not act as if you expect someone to fix a bug by a particular date
+ <i>obligation</i> to fix the [% terms.bugs %] you want fixed is you. Therefore, you
+ should not act as if you expect someone to fix a [% terms.bug %] by a particular date
or release. Aggressive or repeated demands will not be received
well and will almost certainly diminish the impact and interest in your
suggestions.
@@ -80,17 +80,17 @@
<i>things</i>, not <i>people</i>. Examples of things include: interfaces,
algorithms, and schedules. Examples of people include: developers,
designers and users. <b>Attacking a person may result in you being banned
- from Bugzilla.</b>
+ from [% terms.Bugzilla %].</b>
</li>
<li>
<span class="heading">No private email</span>.
- Unless the bug owner or another respected project contributor has asked you
+ Unless the [% terms.bug %] owner or another respected project contributor has asked you
to email them with specific information, please place all information
- relating to bugs
- in the bug itself. Do not send them by private email; no-one else can read
+ relating to [% terms.bugs %]
+ in the [% terms.bug %] itself. Do not send them by private email; no-one else can read
them if you do that, and they'll probably just get ignored. If a file
- is too big for Bugzilla, add a comment giving the file size and contents
+ is too big for [% terms.Bugzilla %], add a comment giving the file size and contents
and ask what to do.
</li>
</ol>
@@ -99,19 +99,19 @@
<ol>
<li>
- <span class="heading">No messing with other people's bugs</span>.
- Unless you are the bug assignee, or have some say over the use of their
+ <span class="heading">No messing with other people's [% terms.bugs %]</span>.
+ Unless you are the [% terms.bug %] assignee, or have some say over the use of their
time, never change the Priority or Target Milestone fields. If in doubt,
- do not change the fields of bugs you do not own - add a comment
+ do not change the fields of [% terms.bugs %] you do not own - add a comment
instead, suggesting the change.
</li>
<li>
<span class="heading">No whining about decisions</span>.
- If a respected project contributor has marked a bug as INVALID, then it is
+ If a respected project contributor has marked a [% terms.bug %] as INVALID, then it is
invalid. Someone filing another duplicate of it does not change this. Unless
you have further important evidence, do not post a comment arguing that an
- INVALID or WONTFIX bug should be reopened.
+ INVALID or WONTFIX [% terms.bug %] should be reopened.
</li>
</ol>
@@ -129,7 +129,7 @@
<p>
If you see someone not following these rules, the first step is, as an exception
to guideline 1.4, to make them aware of this document by <em>private</em> mail.
- Flaming people publically in bugs violates guidelines 1.1 and 1.3. In the case of
+ Flaming people publically in [% terms.bugs %] violates guidelines 1.1 and 1.3. In the case of
persistent offending you should report the matter to
<a href="mailto:gerv@mozilla.org">Gerv</a>.
</p>
@@ -141,7 +141,7 @@
<p>
Other useful documents:
- <a href="page.cgi?id=bug-writing.html">The Bug Writing Guidelines</a>.
+ <a href="page.cgi?id=bug-writing.html">The [% terms.Bug %] Writing Guidelines</a>.
</p>
[% INCLUDE global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
index 023dc4791..a7f26e86d 100644
--- a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
@@ -59,7 +59,7 @@ var selected_components = [
<input type="hidden" name="id" value="triage_reports.html">
<input type="hidden" name="action" value="run">
-Show UNCONFIRMED bugs with:
+Show UNCONFIRMED [% terms.bugs %] with:
<table id="triage_form">
<tr>
@@ -149,7 +149,7 @@ Show UNCONFIRMED bugs with:
</p>
<table border="0" cellspacing="0" id="report" width="100%">
<tr id="report-header">
- <th>Bug / Date</th>
+ <th>[% terms.Bug %] / Date</th>
<th>Summary</th>
<th>Reporter / Commenter</th>
<th>Comment Date</th>
@@ -190,7 +190,7 @@ Show UNCONFIRMED bugs with:
[% ELSE %]
<p>
- No bugs found.
+ No [% terms.bugs %] found.
</p>
[% END %]
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index dd16595ab..bd48d00fd 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -110,7 +110,7 @@
<tr id="report-header">
<th>Who</th>
<th>When</th>
- <th>Bug</th>
+ <th>[% terms.Bug %]</th>
<th>What</th>
<th>Removed</th>
<th>Added</th>
@@ -131,9 +131,9 @@
[% "</tr><tr>" IF loop.index > 0 %]
<td>
[% IF change.attachid %]
- <a href="attachment.cgi?id=[% change.attachid %]">Attachment #[% change.attachid %]</a>
+ <a href="attachment.cgi?id=[% change.attachid FILTER uri %]">Attachment #[% change.attachid FILTER html %]</a>
[% ELSIF change.comment.defined && change.fieldname == 'longdesc' %]
- [% "Comment $change.comment.count" FILTER bug_link(operation.bug, comment_num => change.comment.count) %]
+ [% "Comment $change.comment.count" FILTER bug_link(operation.bug, comment_num => change.comment.count) FILTER none %]
[% ELSE %]
[%+ field_descs.${change.fieldname} FILTER html %]
[% END %]