X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=reminder.py;h=6be8643690547970d8fe1bbd98b4acc174a615aa;hb=6ea2051898eaefcaa0d3adf90c7031cbadf41922;hp=90eebf4e7ac40b414f6430b621d51c4211028ed7;hpb=8c826b6a4c1ea070424027c1a99ad0f6b5eebd19;p=cavote.git

diff --git a/reminder.py b/reminder.py
index 90eebf4..6be8643 100644
--- a/reminder.py
+++ b/reminder.py
@@ -32,7 +32,7 @@ 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
@@ -45,8 +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 :"),
@@ -61,6 +60,7 @@ for vote in c.execute('select id, id_group, date_end, title from votes where is_
                 server.sendmail(EMAIL, user[1], BODY.encode('utf-8'))
                 server.quit()
             else:
+                link = "http://vote.ffdn.org/vote/%d" % vote[0]
                 BODY = string.join((
                     "From: %s" % EMAIL,
                     "To: %s" % user[1],
@@ -69,10 +69,8 @@ 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')),
-                    gettext(u"You have already voted but you can still modify 
-                    your choice"),
+                    "%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 :"),
                     link,