Merge branch 'threadsafe_requestholder' into update_django

[osqa.git] / forum / skins / default / templates / auth / welcome_email.html

diff --git a/forum/skins/default/templates/auth/welcome_email.html b/forum/skins/default/templates/auth/welcome_email.html
index 8746e5635d368a947062534fe1e1b43edd565571..9ebe7ba345184f8115f108b765c17214f9b7bde1 100644 (file)
--- a/forum/skins/default/templates/auth/welcome_email.html
+++ b/forum/skins/default/templates/auth/welcome_email.html
@@ -12,26 +12,26 @@
     {% subject %}{% blocktrans %}{{ prefix }} Welcome to {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
     {% subject %}{% blocktrans %}{{ prefix }} Welcome to {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}

-        <p style="{{ p_style }}}">
-            {% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %} %},
+        <p style="{{ p_style }}">
+            {% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %},

         </p>
 
         </p>
 

-        <p style="{{ p_style }}}">{% trans "Here's your login info (store it in a cool dry place):" %}</p>
+        <p style="{{ p_style }}">{% trans "Here's your login info (store it in a cool dry place):" %}</p>

 
 

-        <p style="{{ p_style }}}">{% trans "Username: " %} {{ recipient.username }}<br />
+        <p style="{{ p_style }}">{% trans "Username: " %} {{ recipient.username }}<br />

         <b>{% trans "Password: As IF we would send your password in cleartext!" %}</b></p>
 
         <b>{% trans "Password: As IF we would send your password in cleartext!" %}</b></p>
 

-        <p style="{{ p_style }}}">{% trans "The following link will help us verify your email address:" %}</p>
+        <p style="{{ p_style }}">{% trans "The following link will help us verify your email address:" %}</p>

 
 

-        <a  style="{{ a_style }}}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}">{% trans "Validate my email address" %}</a></p>

 
 

-        <p style="{{ p_style }}}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
+        <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>

 
 

-        <p style="{{ p_style }}">{% fullurl auth_validate_email user=recipient.id,code=validation_code %}</p>
+        <p style="{{ p_style }}">{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}</p>

     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}

-{% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %} %},
+{% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %},

 {% trans "Here's your login info (store it in a cool dry place):" %}
 
 {% trans "Username: " %} {{ recipient.username }}
 {% trans "Here's your login info (store it in a cool dry place):" %}
 
 {% trans "Username: " %} {{ recipient.username }}


@@ -39,7 +39,7 @@
 
 {% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %}
 
 
 {% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %}
 

-{% fullurl auth_validate_email user=recipient.id,code=validation_code %}
+{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}

 {% endtextcontent %}
 
 {% endemail %}
 {% endtextcontent %}
 
 {% endemail %}