users: Move sending email activation to its own template

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index d5aed69798b1a8e7c9550e2cda02d5d07c2ce3dc..075c805130c8431dbbf87f681da2241416774024 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,7 +244,8 @@ templates_errorsdir = $(templatesdir)/errors
 templates_messagesdir = $(templatesdir)/messages
 
 dist_templates_messages_users_DATA = \
-       src/templates/messages/users/account-activation.markdown
+       src/templates/messages/users/account-activation.markdown \
+       src/templates/messages/users/email-activation.markdown
 
 templates_messages_usersdir = $(templates_messagesdir)/users
 

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 3682ab8eae1ce91290d99058882c539daa11962f..29a98b82a6a39bb643e974c24137b1e99c8b07ab 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -541,25 +541,10 @@ class UserEmail(base.DataObject):
 
                self.user.send_template("messages/users/account-activation")
 
-       def send_email_activation_mail(self, email):
+       def send_email_activation_mail(self):
                logging.debug("Sending email address activation mail to %s" % self.email)
 
-               # Get the saved locale from the user.
-               _ = self.user.locale.translate
-
-               subject = _("Email address Activation")
-
-               message  = _("You, or somebody using your email address, has add this email address to an account on the Pakfire Build Service.")
-               message += "\n"*2
-               message += _("To activate your this email address account, please click on the link below.")
-               message += "\n"*2
-               message += "    %(baseurl)s/user/%(name)s/activate?code=%(activation_code)s" \
-                       % { "baseurl" : self.settings.get("baseurl"), "name" : self.user.name,
-                               "activation_code" : self.activation_code, }
-               message += "\n"*2
-               message += "Sincerely,\n    The Pakfire Build Service"
-
-               self.backend.messages.add(self.recipient, subject, message)
+               self.user.send_template("messages/users/email-activation", email=self)
 
 
 # Some testing code.

diff --git a/src/templates/messages/users/email-activation.markdown b/src/templates/messages/users/email-activation.markdown
new file mode 100644 (file)
index 0000000..8626deb
--- /dev/null
+++ b/src/templates/messages/users/email-activation.markdown
@@ -0,0 +1,10 @@
+Subject: {{ _("Email Address Activation") }}
+
+{{ _("You, or somebody using your email address, has added this email address to an account on the Pakfire Build Service.") }}
+
+{{ _("To activate your this email address, please click on the link below:") }}
+
+  {{ baseurl }}/user/{{ user.name }}/activate?code={{ email.activation_code }}
+
+Sincerely,  
+-The Pakfire Build Service
\ No newline at end of file