From a86e59b026ee875630cfda1f55fe5371947031c2 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 18 Apr 2017 19:03:19 -0300 Subject: [#927] Adds email template translation for portuguese --- service/pixelated/account_recovery.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'service/pixelated/account_recovery.py') diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py index 723d4048..4e8a1583 100644 --- a/service/pixelated/account_recovery.py +++ b/service/pixelated/account_recovery.py @@ -15,6 +15,7 @@ # along with Pixelated. If not, see . import pkg_resources +import binascii from twisted.internet.defer import inlineCallbacks, returnValue from twisted.logger import Logger @@ -28,12 +29,13 @@ log = Logger() class AccountRecovery(object): - def __init__(self, session, soledad, smtp_config, backup_email, domain): + def __init__(self, session, soledad, smtp_config, backup_email, domain, language='en-US'): self._bonafide_session = session self._soledad = soledad self._smtp_config = smtp_config self._backup_email = backup_email self._domain = domain + self._language = language @inlineCallbacks def update_recovery_code(self): @@ -72,15 +74,15 @@ class AccountRecovery(object): log.error('Failed trying to send the email with the recovery code') raise e - def _get_recovery_mail(self, code, language='en-US'): + def _get_recovery_mail(self, code): recovery_mail = pkg_resources.resource_filename( 'pixelated.assets', - 'recovery.mail.%s' % (language)) + 'recovery.mail.%s' % (self._language)) account_recovery_url = '{}/{}'.format(self._domain, AccountRecoveryResource.BASE_URL) with open(recovery_mail) as mail_template_file: return mail_template_file.read().format( domain=self._domain, - recovery_code=code, + recovery_code=binascii.hexlify(code), account_recovery_url=account_recovery_url) -- cgit v1.2.3 From 995446a82ef694e0705e94effb494812e0b3ae9f Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 19 Apr 2017 11:29:42 -0300 Subject: [#927] Adds headers to recovery code email template with @deniscostadsc --- service/pixelated/account_recovery.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'service/pixelated/account_recovery.py') diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py index 4e8a1583..d2110bb3 100644 --- a/service/pixelated/account_recovery.py +++ b/service/pixelated/account_recovery.py @@ -21,7 +21,7 @@ from twisted.internet.defer import inlineCallbacks, returnValue from twisted.logger import Logger from twisted.mail import smtp -from email.mime.text import MIMEText +from email import message_from_string from pixelated.resources.account_recovery_resource import AccountRecoveryResource @@ -58,10 +58,7 @@ class AccountRecovery(object): log.info('Sending mail containing the user\'s recovery code') sender = 'team@{}'.format(self._domain) - msg = MIMEText(self._get_recovery_mail(code)) - msg['Subject'] = 'Recovery Code' - msg['From'] = sender - msg['To'] = backup_email + msg = self._get_recovery_mail(code, sender, backup_email) try: send_mail_result = yield smtp.sendmail( @@ -74,7 +71,7 @@ class AccountRecovery(object): log.error('Failed trying to send the email with the recovery code') raise e - def _get_recovery_mail(self, code): + def _get_recovery_mail(self, code, sender, backup_email): recovery_mail = pkg_resources.resource_filename( 'pixelated.assets', 'recovery.mail.%s' % (self._language)) @@ -82,7 +79,10 @@ class AccountRecovery(object): account_recovery_url = '{}/{}'.format(self._domain, AccountRecoveryResource.BASE_URL) with open(recovery_mail) as mail_template_file: - return mail_template_file.read().format( + return message_from_string(mail_template_file.read().format( domain=self._domain, recovery_code=binascii.hexlify(code), - account_recovery_url=account_recovery_url) + account_recovery_url=account_recovery_url, + backup_email=backup_email, + sender=sender, + date='Sat, 21 Mar 2015 19:30:09 -0300')) -- cgit v1.2.3 From a3763301042c5db0231b0e9e2d4a62d41d374d49 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 19 Apr 2017 13:51:47 -0300 Subject: [#927] Adds date to recovery code email with @deniscostadsc --- service/pixelated/account_recovery.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'service/pixelated/account_recovery.py') diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py index d2110bb3..dae3da1b 100644 --- a/service/pixelated/account_recovery.py +++ b/service/pixelated/account_recovery.py @@ -22,6 +22,7 @@ from twisted.logger import Logger from twisted.mail import smtp from email import message_from_string +from email.utils import formatdate from pixelated.resources.account_recovery_resource import AccountRecoveryResource @@ -85,4 +86,4 @@ class AccountRecovery(object): account_recovery_url=account_recovery_url, backup_email=backup_email, sender=sender, - date='Sat, 21 Mar 2015 19:30:09 -0300')) + date=formatdate(localtime=True))) -- cgit v1.2.3 From d2c13c6f8535418b7c90d1f0d75fe88b2c68dd85 Mon Sep 17 00:00:00 2001 From: Denis Costa Date: Wed, 19 Apr 2017 16:52:02 -0300 Subject: [#927] Removes recovery url from email @anikarni --- service/pixelated/account_recovery.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'service/pixelated/account_recovery.py') diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py index dae3da1b..f84aea1a 100644 --- a/service/pixelated/account_recovery.py +++ b/service/pixelated/account_recovery.py @@ -24,8 +24,6 @@ from twisted.mail import smtp from email import message_from_string from email.utils import formatdate -from pixelated.resources.account_recovery_resource import AccountRecoveryResource - log = Logger() @@ -77,13 +75,10 @@ class AccountRecovery(object): 'pixelated.assets', 'recovery.mail.%s' % (self._language)) - account_recovery_url = '{}/{}'.format(self._domain, AccountRecoveryResource.BASE_URL) - with open(recovery_mail) as mail_template_file: return message_from_string(mail_template_file.read().format( domain=self._domain, recovery_code=binascii.hexlify(code), - account_recovery_url=account_recovery_url, backup_email=backup_email, sender=sender, date=formatdate(localtime=True))) -- cgit v1.2.3