more porting work

3 files changed, 36 insertions, 14 deletions

diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 44344d7f5..26fb58fa3 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -56,6 +56,21 @@ BEGIN {
 # Installation #
 ################
 
+BEGIN {
+    *Bugzilla::Bug::votes = \&votes;
+}
+
+sub votes {
+    my $self = shift;
+    my $dbh = Bugzilla->dbh;
+
+    return $self->{votes} if exists $self->{votes};
+
+    $self->{votes} = $dbh->selectrow_array('SELECT votes FROM bugs WHERE bug_id = ?',
+                                           undef, $self->id);
+    return $self->{votes};
+}
+
 sub db_schema_abstract_schema {
     my ($self, $args) = @_;
     $args->{'schema'}->{'votes'} = {
@@ -676,7 +691,7 @@ sub _modify_bug_votes {
         }
     }
 
-    $changes->{'too_many_votes'} = \@toomanyvotes_list;
+    $changes->{'_too_many_votes'} = \@toomanyvotes_list;
 
     # 2. too many total votes for a single user.
     # This part doesn't work in the general case because _remove_votes
@@ -723,7 +738,7 @@ sub _modify_bug_votes {
         }
     }
 
-    $changes->{'too_many_total_votes'} = \@toomanytotalvotes_list;
+    $changes->{'_too_many_total_votes'} = \@toomanytotalvotes_list;
 
     # 3. enough votes to confirm
     my $bug_list = $dbh->selectcol_arrayref(
@@ -736,7 +751,7 @@ sub _modify_bug_votes {
         my $confirmed = _confirm_if_vote_confirmed($bug_id);
         push (@updated_bugs, $bug_id) if $confirmed;
     }
-    $changes->{'confirmed_bugs'} = \@updated_bugs;
+    $changes->{'_confirmed_bugs'} = \@updated_bugs;
 
     # Now that changes are done, we can send emails to voters.
     foreach my $msg (@msgs) {
@@ -746,7 +761,7 @@ sub _modify_bug_votes {
     foreach my $bug_id (@updated_bugs) {
         my $sent_bugmail = Bugzilla::BugMail::Send(
             $bug_id, { changer => Bugzilla->user });
-        $changes->{'confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
+        $changes->{'_confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
     }
 }
 
@@ -819,7 +834,7 @@ sub _remove_votes {
             };
 
             my $voter = new Bugzilla::User($userid);
-            my $template = Bugzilla->template_inner($voter->settings->{'lang'}->{'value'});
+            my $template = Bugzilla->template_inner($voter->setting('lang'));
 
             my $msg;
             $template->process("voting/votes-removed.txt.tmpl", $vars, \$msg);
diff --git a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
index af2b1c102..15fb1efe0 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl
@@ -56,8 +56,8 @@
 
   <p>Checking existing votes in this product for anybody who now
   has too many votes for [% terms.abug %]...<br>
-  [% IF changes.too_many_votes.size %]
-    [% FOREACH detail = changes.too_many_votes %]
+  [% IF changes._too_many_votes.size %]
+    [% FOREACH detail = changes._too_many_votes %]
       &rarr;removed votes for [% terms.bug %] <a href="show_bug.cgi?id=
      [%- detail.id FILTER uri %]">
      [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br>
@@ -69,8 +69,8 @@
 
   <p>Checking existing votes in this product for anybody
   who now has too many total votes...<br>
-  [% IF changes.too_many_total_votes.size %]
-    [% FOREACH detail = changes.too_many_total_votes %]
+  [% IF changes._too_many_total_votes.size %]
+    [% FOREACH detail = changes._too_many_total_votes %]
       &rarr;removed votes for [% terms.bug %] <a href="show_bug.cgi?id=
      [%- detail.id FILTER uri %]">
      [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br>
@@ -82,15 +82,15 @@
 
   <p>Checking unconfirmed [% terms.bugs %] in this product for any which now have
   sufficient votes...<br>
-  [% IF changes.confirmed_bugs.size %]
-    [% FOREACH id = changes.confirmed_bugs %]
+  [% IF changes._confirmed_bugs.size %]
+    [% FOREACH id = changes._confirmed_bugs %]
 
       [%# This is INCLUDED instead of PROCESSED to avoid variables getting
           overwritten, which happens otherwise %]
       [% INCLUDE bug/process/results.html.tmpl
         type = 'votes'
         header_done = 1
-        sent_bugmail = changes.confirmed_bugs_sent_bugmail.$id
+        sent_bugmail = changes._confirmed_bugs_sent_bugmail.$id
         id = id
       %]
     [% END %]
diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
index 169e9995d..61eaf8491 100644
--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -111,8 +111,15 @@
         [% FOREACH bug = product.bugs %]
           <tr [% IF bug.id == this_bug.id && canedit %] 
             class="bz_bug_being_voted_on" [% END %]>
-            <td>[% IF bug.id == this_bug.id && canedit %]Enter New Vote here &rarr;
-              [%- END %]</td>
+            <td>
+              [% IF bug.id == this_bug.id && canedit %]
+                [% IF product.onevoteonly %]
+                  Vote For This [% terms.Bug %] &rarr;
+                [% ELSE %]
+                  Enter Votes Here &rarr;
+                [% END %]
+              [%- END %]
+            </td>
             <td align="right"><a name="vote_[% bug.id FILTER html %]">
               [% IF canedit %]
                 [% IF product.onevoteonly %]