From befdcc8f9a30f55e91227bac0ee1813a661002b3 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 4 Oct 2011 18:43:47 -0400 Subject: more porting work --- Bugzilla/Install/DB.pm | 23 --------- extensions/BMO/lib/FakeBug.pm | 2 + .../template/en/default/account/create.html.tmpl | 10 ++-- .../default/bug/create/create-brownbag.html.tmpl | 4 +- .../default/bug/create/create-itrequest.html.tmpl | 4 +- .../default/bug/create/create-mktgevent.html.tmpl | 3 +- .../en/default/bug/create/create-mozlist.html.tmpl | 26 +++++------ .../en/default/bug/create/create-mozpr.html.tmpl | 29 ++++++------ .../bug/create/create-presentation.html.tmpl | 4 +- .../en/default/bug/create/create-swag.html.tmpl | 9 ++-- .../en/default/bug/create/user-message.html.tmpl | 22 ++++----- .../en/default/global/choose-product.html.tmpl | 9 ++-- .../hook/bug/create/create-guided-form.html.tmpl | 2 +- .../hook/global/header-additional_header.html.tmpl | 2 +- .../en/default/hook/global/header-start.html.tmpl | 12 ++++- .../auth_failure/permissions.html.tmpl | 2 +- .../en/default/list/list.microsummary.tmpl | 2 +- .../template/en/default/list/server-push.html.tmpl | 2 +- .../template/en/default/pages/etiquette.html.tmpl | 42 ++++++++--------- .../en/default/pages/triage_reports.html.tmpl | 6 +-- .../en/default/pages/user_activity.html.tmpl | 6 +-- .../BzAPI/template/en/default/config.json.tmpl | 18 ++++---- .../account/prefs/component_watch.html.tmpl | 10 ++-- extensions/Example/Extension.pm | 36 ++++++++++++--- extensions/Example/lib/Config.pm | 2 + .../template/en/default/guided/guided.html.tmpl | 24 +++++----- extensions/InlineHistory/Extension.pm | 6 +++ .../hook/bug/comments-aftercomments.html.tmpl | 47 +++++++++++-------- .../en/default/bug/create/create-mozreps.html.tmpl | 18 ++++---- .../default/bug/create/created-mozreps.html.tmpl | 2 +- .../en/default/account/prefs/securemail.html.tmpl | 6 +-- .../en/default/pages/securemail/help.html.tmpl | 6 +-- extensions/SiteMapIndex/lib/Util.pm | 4 +- extensions/Splinter/lib/Util.pm | 22 +++++---- .../template/en/default/pages/splinter.html.tmpl | 10 ++-- .../en/default/pages/splinter/help.html.tmpl | 54 +++++++++++----------- extensions/Splinter/web/splinter.js | 45 ++++++++++++++---- .../en/default/hook/bug/comments-user.html.tmpl | 4 +- extensions/Voting/Extension.pm | 25 ++++++++-- .../hook/admin/products/updated-changes.html.tmpl | 14 +++--- .../en/default/pages/voting/user.html.tmpl | 11 ++++- template/en/default/list/list.html.tmpl | 4 +- 42 files changed, 335 insertions(+), 254 deletions(-) diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index f30e1503b..1b6acce35 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -637,9 +637,6 @@ sub update_table_definitions { # 2009-05-07 ghendricks@novell.com - Bug 77193 _add_isactive_to_product_fields(); - # 2009-05-07 ghendricks@novell.com - Bug 77193 - _add_isactive_to_product_fields(); - # 2010-10-09 LpSolit@gmail.com - Bug 505165 $dbh->bz_alter_column('flags', 'setter_id', {TYPE => 'INT3', NOTNULL => 1}); @@ -3429,26 +3426,6 @@ sub _remove_attachment_isurl { } } -sub _add_isactive_to_product_fields { - my $dbh = Bugzilla->dbh; - - # If we add the isactive column all values should start off as active - if (!$dbh->bz_column_info('components', 'isactive')) { - $dbh->bz_add_column('components', 'isactive', - {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'}); - } - - if (!$dbh->bz_column_info('versions', 'isactive')) { - $dbh->bz_add_column('versions', 'isactive', - {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'}); - } - - if (!$dbh->bz_column_info('milestones', 'isactive')) { - $dbh->bz_add_column('milestones', 'isactive', - {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'}); - } -} - sub _migrate_field_visibility_value { my $dbh = Bugzilla->dbh; 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() {
  1. Please consider reading our - bug writing guidelines. + [% terms.bug %] writing guidelines.
  2. - 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 alternative email address for this reason.
  3. 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.
@@ -158,9 +158,9 @@ function onSubmit() {

- If you think there's something wrong with Bugzilla, you can + If you think there's something wrong with [% terms.Bugzilla %], you can send an email to the admins, 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.

[% 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() { - + @@ -146,7 +146,7 @@ function trySubmit() { - + 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 %]

Please use this form for IT requests only!

-

If you have a bug to file, go here.

+

If you have a [% terms.bug %] to file, go here.

@@ -172,7 +172,7 @@

- +
(please uncheck this box if it isn't)

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() { - - + 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 @@
Note: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.
@@ -287,7 +287,7 @@
- - - + + + @@ -466,7 +466,7 @@ TUI_hide_default('expert_fields'); [% 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'); Status Whiteboard: + value="[% status_whiteboard FILTER html %]"> @@ -571,13 +571,14 @@ TUI_hide_default('expert_fields'); - [% IF group.size %] + [% IF product.groups_available.size %]  
- 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 %]:
@@ -587,12 +588,14 @@ TUI_hide_default('expert_fields');
- [% FOREACH g = group %] -      - -
+ + [% FOREACH group = product.groups_available %] + +
[% END %] 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() { - + @@ -142,7 +142,7 @@ function trySubmit() { - + 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 @@

Swag Request: Please use this form to file a request for swag.

    -
  1. You first need submit a Event Request Form. You'll be asked for the bug number below.
    2. +
  2. You first need submit a Event Request Form. You'll be asked for the [% terms.bug %] number below.
  3. Complete and submit request below.
  4. Your request will be reviewed by the appropriate person in the Engagement team.
  5. 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() { - - +
@@ -143,7 +142,7 @@ function validateAndSubmit() { - + 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 full product list.

The product you have chosen is for [% terms.bug %] reports and enhancement requests for the -Bugzilla [% terms.bug %] tracking software only. -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. +[% terms.Bugzilla +%] [%+ terms.bug %] tracking software only. +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 %]

-

We WILL NOT accept [% terms.bug %] reports for Bugzilla -installed via the Debian packaging system. If you obtained Bugzilla from Debian, +

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 Debian Support page, -or file a bug on the Debian -Bug Tracker. 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.

+or file a [% terms.bug %] on the Debian +[% terms.Bug %] Tracker. 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.

-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 mozilla.org product.

Please do not file test [% terms.bugs %] or support requests here! You -can test Bugzilla at +can test [% terms.Bugzilla %] at landfill.bugzilla.org and ask for support in the @@ -106,7 +106,7 @@ support-bugzilla@lists.mozilla.org mailing list, or [% UNLESS cloned_bug_id %] Consider using the -Bugzilla Helper instead of this form. +[% terms.Bugzilla %] Helper instead of this form. [% END +%] Before reporting a [% terms.bug %], make sure you've read our 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 @@

-

Looking for technical support or help getting your site to work with Mozilla? Visit the mozilla.org support page before filing bugs.

+

Looking for technical support or help getting your site to work with Mozilla? Visit the mozilla.org support page before filing [% terms.bugs %].

@@ -96,12 +97,12 @@ icon="dino.png" %] - - + 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 @@ [% IF bug %] - + [% END %]
Bug number assigned to previously-   
submitted Event Request Form: *		[% terms.Bug %] number assigned to previously-   
submitted Event Request Form: *

@@ -146,7 +147,7 @@
[% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %] -

You can choose to get this screen by default when you click "New Bug" by changing your preferences.

+

You can choose to get this screen by default when you click "New [% terms.Bug %]" by changing your preferences.

[% END %] [% END %]
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 @@ -

Security