more porting work

8 files changed, 51 insertions, 50 deletions

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">