X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=reminder.py;h=7b7c07fe65de7cb2e3e262c4d479083f15e72176;hb=HEAD;hp=e72c3500916d924edf98e9717786a3bdb822ebf7;hpb=795c519c47ce373311b6590b264aa618356a9a49;p=cavote.git

diff --git a/reminder.py b/reminder.py
index e72c350..7b7c07f 100644
--- a/reminder.py
+++ b/reminder.py
@@ -32,11 +32,11 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
         for user in c.execute('select users.id, users.email, users.name from users join user_group on users.id=user_group.id_user where user_group.id_group = ?', voting_group).fetchall():
             userchoice_request = (user[0], vote[0],)
             userchoice = c.execute('select * from user_choice join choices on user_choice.id_choice = choices.id where id_user = ? and id_vote = ?', userchoice_request).fetchone()
-            print "Checking if user %s already voted %s" % (user[1], vote[3])
+            print "Checking if user %s already voted %s" % (user[1].encode('utf-8'), vote[3].encode('utf-8'))
             print userchoice
             if userchoice is None:
                 #user didn't vote yet
-                link = "http://vote.ffdn.org/vote/%d" % vote[0]
+                link = VOTE_URL % vote[0]
                 BODY = string.join((
                     "From: %s" % EMAIL,
                     "To: %s" % user[1],
@@ -45,7 +45,7 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
                     "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "",
-                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on"), vote[2], vote[3].encode('utf-8')),
+                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on"), vote[2], vote[3]),
                     gettext(u"You still didn't take part to it !"),
                     "",
                     gettext(u"This link will bring you to the form where you will be able to participate :"),
@@ -56,10 +56,11 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
                 server = smtplib.SMTP(SMTP_SERVER)
                 print EMAIL
                 print user[1]
-                print BODY
+                print BODY.encode('utf-8')
                 server.sendmail(EMAIL, user[1], BODY.encode('utf-8'))
                 server.quit()
             else:
+                link = VOTE_URL % vote[0]
                 BODY = string.join((
                     "From: %s" % EMAIL,
                     "To: %s" % user[1],
@@ -68,7 +69,7 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
                     "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "",
-                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on "), vote[2], vote[3].encode('utf-8')),
+                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on "), vote[2], vote[3]),
                     gettext(u"You have already voted but you can still modify your choice"),
                     "",
                     gettext(u"This link will bring you to the form where you will be able to participate :"),
@@ -79,6 +80,6 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
                 server = smtplib.SMTP(SMTP_SERVER)
                 print EMAIL
                 print user[1]
-                print BODY
+                print BODY.encode('utf-8')
                 server.sendmail(EMAIL, user[1], BODY.encode('utf-8'))
                 server.quit()