From 9a7638fe415b8c305f86b62c2342a5fed9189d53 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Tue, 25 Oct 2005 12:43:11 +0000
Subject: [PATCH] updated for SQL change fix grammar accept votes :-)

2005-10-25  Vincent Untz  <vuntz@gnome.org>

	* foundation.gnome.org/vote/include/election-sql.php: updated for SQL
	change
	* foundation.gnome.org/vote/include/step1-login.php: fix grammar
	* foundation.gnome.org/vote/include/step3-confirm.php: accept votes
	:-)
---
 ChangeLog                                           | 8 ++++++++
 foundation.gnome.org/vote/include/election-sql.php  | 2 +-
 foundation.gnome.org/vote/include/step1-login.php   | 2 +-
 foundation.gnome.org/vote/include/step3-confirm.php | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aee9c7..df97c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-25  Vincent Untz  <vuntz@gnome.org>
+
+	* foundation.gnome.org/vote/include/election-sql.php: updated for SQL
+	change
+	* foundation.gnome.org/vote/include/step1-login.php: fix grammar
+	* foundation.gnome.org/vote/include/step3-confirm.php: accept votes
+	:-)
+
 2005-10-25  Vincent Untz  <vuntz@gnome.org>
 
 	* foundation.gnome.org/vote/include/election-sql.php: use correct name
diff --git a/foundation.gnome.org/vote/include/election-sql.php b/foundation.gnome.org/vote/include/election-sql.php
index 6c2929f..cfc3406 100644
--- a/foundation.gnome.org/vote/include/election-sql.php
+++ b/foundation.gnome.org/vote/include/election-sql.php
@@ -215,7 +215,7 @@ function elec_election_has_ended ($election) {
 }
 
 function elec_election_get_type ($election) {
-  if ($election["type"] == "1")
+  if ($election["type"] == "referendum")
     return "referendum";
   else
     return "election";
diff --git a/foundation.gnome.org/vote/include/step1-login.php b/foundation.gnome.org/vote/include/step1-login.php
index fd5bc2b..86f6574 100644
--- a/foundation.gnome.org/vote/include/step1-login.php
+++ b/foundation.gnome.org/vote/include/step1-login.php
@@ -6,7 +6,7 @@ function step1_do () {
 
   $result = "<h2>Step 1/4 - Login</h2>\n";
 
-  $result .= "<p>Please login using the informations that was sent to you in a ballot by e-mail.</p>\n";
+  $result .= "<p>Please login using the informations that were sent to you by e-mail.</p>\n";
 
   $result .= "<div class=\"votedata\">\n";
   $result .= "<p><label for=\"email\">E-mail: </label><input type=\"text\" name=\"email\" value=\"".htmlspecialchars ($email)."\" /></p>\n";
diff --git a/foundation.gnome.org/vote/include/step3-confirm.php b/foundation.gnome.org/vote/include/step3-confirm.php
index fa95206..0d5dd09 100644
--- a/foundation.gnome.org/vote/include/step3-confirm.php
+++ b/foundation.gnome.org/vote/include/step3-confirm.php
@@ -10,7 +10,7 @@ function step3_do () {
   $result = "<h2>Step 3/4 - Confirm your vote</h2>\n";
 
   $result .= "<p><strong>".$election["question"]."</strong></p>\n";
-  if (($choices_nb == 1 && $vote < 0) ||
+  if (($choices_nb == 1 && $vote >= 0) ||
       ($choices_nb > 1 && count ($votes_array) >= 1)) {
     $result .= "<p>You choose to vote for:</p>\n";