Browse Source

fix utf-8 issue and a missing variable in reminder.py

Julien Rabier 12 years ago
parent
commit
6ea2051898
1 changed files with 3 additions and 2 deletions
  1. 3 2
      reminder.py

+ 3 - 2
reminder.py

@@ -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",
                     "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "X-Mailer: %s" % VERSION,
                     "",
                     "",
-                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on"), vote[2].encode('utf-8'), 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"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 :"),
                     gettext(u"This link will bring you to the form where you will be able to participate :"),
@@ -60,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.sendmail(EMAIL, user[1], BODY.encode('utf-8'))
                 server.quit()
                 server.quit()
             else:
             else:
+                link = "http://vote.ffdn.org/vote/%d" % vote[0]
                 BODY = string.join((
                 BODY = string.join((
                     "From: %s" % EMAIL,
                     "From: %s" % EMAIL,
                     "To: %s" % user[1],
                     "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",
                     "Content-type: text/plain; charset=utf-8",
                     "X-Mailer: %s" % VERSION,
                     "X-Mailer: %s" % VERSION,
                     "",
                     "",
-                    "%s %s : %s" % (gettext(u"A vote concerns you and is going to terminate on "), vote[2].encode('utf-8'), 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"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 :"),
                     gettext(u"This link will bring you to the form where you will be able to participate :"),