From d7e02ed95c896ed4d7bcae3d72e2869fdaa9fbee Mon Sep 17 00:00:00 2001
From: Arne Schauf <arne@as-webservices.de>
Date: Sun, 29 Sep 2013 16:26:31 +0200
Subject: [PATCH] link fixing (leave me alone, i18n)

---
 .../templates/registration/activation_complete.html    |  8 +++-----
 .../templates/registration/activation_email.txt        | 10 +++-------
 .../registration/activation_email_subject.txt          |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/nsupdate/accounts/templates/registration/activation_complete.html b/nsupdate/accounts/templates/registration/activation_complete.html
index 77da5d1..83c3bd6 100644
--- a/nsupdate/accounts/templates/registration/activation_complete.html
+++ b/nsupdate/accounts/templates/registration/activation_complete.html
@@ -1,11 +1,9 @@
 {% extends "registration/registration_base.html" %}
 {% load i18n %}
-{% url 'auth_login' as auth_login_url %}
-{% block title %}{% trans "Activation complete" %}{% endblock %}
+{% block title %}Activation complete{% endblock %}
 {% block content %}
-{% blocktrans %}
-Thanks, activation complete!  You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration.
-{% endblocktrans %}
+<h1>Thanks, activation complete!</h1>
+<p>You may now <a href="{% url 'auth_login' %}">login</a> using the username and password you set at registration.</p>
 {% endblock %}
 
 
diff --git a/nsupdate/accounts/templates/registration/activation_email.txt b/nsupdate/accounts/templates/registration/activation_email.txt
index 9ca54b3..38912fb 100644
--- a/nsupdate/accounts/templates/registration/activation_email.txt
+++ b/nsupdate/accounts/templates/registration/activation_email.txt
@@ -1,15 +1,11 @@
-{% load i18n %}
-{% url 'registration_activate' activation_key as activation_key_url%}
-{% blocktrans with sitename=site.name siteurl=site.domain %}
 You (or someone pretending to be you) have asked to register an account at
-{{ sitename }}.  If this wasn't you, please ignore this email
+{{ site.name }}. If this wasn't you, please ignore this email
 and your address will be removed from our records.
 
 To activate this account, please click the following link within the next 
 {{ expiration_days }} days:
 
-http://{{ siteurl }}{{ activation_key_url }}
+http://{{ site.domain }}{% url 'registration_activate' %}
 
 Sincerely,
-{{ sitename }} Management
-{% endblocktrans %}
\ No newline at end of file
+{{ site.name }} Management
diff --git a/nsupdate/accounts/templates/registration/activation_email_subject.txt b/nsupdate/accounts/templates/registration/activation_email_subject.txt
index bdb8399..13912aa 100644
--- a/nsupdate/accounts/templates/registration/activation_email_subject.txt
+++ b/nsupdate/accounts/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-{% load i18n %}{% blocktrans with sitename=site.name %}Account registration for {{ sitename }}{% endblocktrans %}
+Account registration for {{ site.name }}