X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=reminder.py;h=7b7c07fe65de7cb2e3e262c4d479083f15e72176;hb=refs%2Fheads%2Fmaster;hp=007487f207271c619f6f7a47da6b2e5966160026;hpb=0a372d651f8cdb8ab5f0442060104caef8319f18;p=cavote.git

diff --git a/reminder.py b/reminder.py
index 007487f..7b7c07f 100644
--- a/reminder.py
+++ b/reminder.py
@@ -6,14 +6,14 @@ from datetime import date, datetime, timedelta
 import time
 
 from settings import *
-
+from flaskext.babel import gettext
 
 import sqlite3
 
 conn = sqlite3.connect(DATABASE)
 c = conn.cursor()
 
-for vote in c.execute('select id, id_group, date_end, title from votes where is_open=1 and is_terminated=0'):
+for vote in c.execute('select id, id_group, date_end, title from votes where is_open=1 and is_terminated=0').fetchall():
     date_end_vote = datetime.strptime(vote[2], "%Y-%m-%d")
     date_today = datetime.today()
     date_begin_reminder = date_end_vote + timedelta(days=-3)
@@ -32,51 +32,54 @@ 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],
-                    "Subject: [Cavote] Vote reminder - You didn't take part to it",
+                    "Subject: [Cavote] %s" % gettext(u"Vote reminder - You didn't take part to it"),
                     "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'),
+                    "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "",
-                    "A vote concerns you and is going to terminate on %s : %s" % (vote[2], vote[3]),
-                    "You still didn't take part to it !",
+                    "%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 !"),
                     "",
-                    "This link will bring you to the form where you will be able to participate :",
+                    gettext(u"This link will bring you to the form where you will be able to participate :"),
                     link,
                     "",
-                    "If you think this mail is not for you, please ignore and delete it."
+                    gettext(u"If you think this mail is not for you, please ignore and delete it.")
                     ), "\r\n")
                 server = smtplib.SMTP(SMTP_SERVER)
                 print EMAIL
                 print user[1]
-                print BODY
-                server.sendmail(EMAIL, user[1], 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],
-                    "Subject: [Cavote] Vote reminder - Last days to modify your choice",
+                    "Subject: [Cavote] %s" % gettext(u"Vote reminder - Last days to modify your choice"),
                     "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'),
+                    "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "",
-                    "A vote concerns you and is going to terminate on %s : %s" % (vote[2], vote[3]),
-                    "You have already voted by can still modify you 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"),
                     "",
-                    "This link will bring you to the form where you will be able to participate :",
+                    gettext(u"This link will bring you to the form where you will be able to participate :"),
                     link,
                     "",
-                    "If you think this mail is not for you, please ignore and delete it."
+                    gettext(u"If you think this mail is not for you, please ignore and delete it.")
                     ), "\r\n")
                 server = smtplib.SMTP(SMTP_SERVER)
                 print EMAIL
                 print user[1]
-                print BODY
-                server.sendmail(EMAIL, user[1], BODY)
+                print BODY.encode('utf-8')
+                server.sendmail(EMAIL, user[1], BODY.encode('utf-8'))
                 server.quit()