From b6bc185c9a8b7e26bdecd916fe124f2b80b47b55 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 4 Jul 2019 09:33:00 +0200 Subject: [PATCH] misc: move account related messages into templates (#21017) --- .../templates/registration/account_deletion_message.html | 1 + .../registration/registration_success_message.html | 1 + src/authentic2/views.py | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 src/authentic2/templates/registration/account_deletion_message.html create mode 100644 src/authentic2/templates/registration/registration_success_message.html diff --git a/src/authentic2/templates/registration/account_deletion_message.html b/src/authentic2/templates/registration/account_deletion_message.html new file mode 100644 index 00000000..902f5690 --- /dev/null +++ b/src/authentic2/templates/registration/account_deletion_message.html @@ -0,0 +1 @@ +{% load i18n %}{% trans "Your account has been scheduled for deletion. You cannot use it anymore." %} diff --git a/src/authentic2/templates/registration/registration_success_message.html b/src/authentic2/templates/registration/registration_success_message.html new file mode 100644 index 00000000..dedd2414 --- /dev/null +++ b/src/authentic2/templates/registration/registration_success_message.html @@ -0,0 +1 @@ +{% load i18n %}{% trans "You have just created an account." %} diff --git a/src/authentic2/views.py b/src/authentic2/views.py index 644f6fb6..e981c3ea 100644 --- a/src/authentic2/views.py +++ b/src/authentic2/views.py @@ -50,6 +50,7 @@ from django.views.generic.edit import CreateView from django.forms import CharField, Form from django.core.urlresolvers import reverse_lazy from django.http import HttpResponseBadRequest +from django.template import loader from . import (utils, app_settings, compat, decorators, constants, models, cbv, hooks, validators) @@ -1057,7 +1058,8 @@ class RegistrationCompletionView(CreateView): request, user, method=self.authentication_method, service_slug=self.service) - messages.info(self.request, _('You have just created an account.')) + message_template = loader.get_template('registration/registration_success_message.html') + messages.info(self.request, message_template.render(request=request)) self.send_registration_success_email(user) return utils.redirect(request, self.get_success_url()) @@ -1113,8 +1115,8 @@ class DeleteView(FormView): self.request.user.save(update_fields=['email', 'email_verified']) logger.info(u'deletion of account %s requested', self.request.user) hooks.call_hooks('event', name='delete-account', user=self.request.user) - messages.info(self.request, - _('Your account has been scheduled for deletion. You cannot use it anymore.')) + message_template = loader.get_template('registration/account_deletion_message.html') + messages.info(self.request, message_template.render(request=self.request)) return super(DeleteView, self).form_valid(form) registration_completion = valid_token(RegistrationCompletionView.as_view()) -- 2.20.1