Merge branch 'demo2' into demo

This commit is contained in:
Jarmil 2019-12-06 19:15:19 +01:00
commit afb3fc28c8
2 changed files with 2 additions and 2 deletions

View File

@ -183,7 +183,7 @@ def sendRegisterTokenReg(rt):
word_days = "dní"
if appSettings.TOKEN_VALID_SEC < 60*60*24*5:
word_days = "dny"
if appSettings.TOKEN_VALID_SEC < 60*60*24*1:
if appSettings.TOKEN_VALID_SEC <= 60*60*24*1:
word_days = "den"
emailSubj = 'Piráti - nalodění - registrační odkaz'

View File

@ -509,7 +509,7 @@ def profil(request):
messages.info(request, "Odvolal/a jste souhlas se zpracováním osobních údajů.")
send_mail(
"Nalodeni: %s odvolal souhlas se zpracovanim osobnich udaju" % request.user.email,
"Stalo se tak {approxdate}".format(approxdate=datetime.now()),
"Stalo se tak {mydate}".format(mydate=request.user.dc_undo_stamp),
"nalodeni@pirati.cz", [appSettings.EMAIL_RECIPIENT_GDPR],
)
return save_and_redirect('/ja-pirat/profil/')