OSQA-600, notification templates unicode fixes.

[osqa.git] / forum / skins / default / templates / notifications / newmember.html

diff --git a/forum/skins/default/templates/notifications/newmember.html b/forum/skins/default/templates/notifications/newmember.html
index 67fba1ffacc118ae8163e633a5e97812ff1485e9..5de2f294319bc744e452c8229ea88e7c03e271f5 100644 (file)
--- a/forum/skins/default/templates/notifications/newmember.html
+++ b/forum/skins/default/templates/notifications/newmember.html
@@ -1,29 +1,31 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
-    app_url = settings.APP_URL
-    newmember_name = newmember.username
-    newmember_url = newmember.get_profile_url()
-    newmember_link = html.objlink(newmember, style=settings.EMAIL_ANCHOR_STYLE)
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
+    app_name = smart_str(settings.APP_SHORT_NAME)
+    safe_app_name = html.mark_safe(smart_str(settings.APP_SHORT_NAME))
+    app_url = smart_str(settings.APP_URL)
+    newmember_name = smart_str(newmember.username)
+    safe_newmember_name = html.mark_safe(smart_str(newmember.username))
+    newmember_url = smart_str(newmember.get_profile_url())
+    newmember_link = html.objlink(smart_str(newmember), style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
-    {% subject %}{% blocktrans %}{{ prefix }}{{ newmember_name }} is a new member on {{ app_name }}{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} {{ safe_newmember_name }} is a new member on {{ safe_app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">
             {% blocktrans %}
-            {{ newmember_link }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following link: <br />
-            <a href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }} profile</a>
+            {{ newmember_link }} has just joined {{ app_name }}.
+            View <a style="{{ a_style }}" href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }}'s profile</a>.
             {% endblocktrans %}
         </p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}
-{{ newmember_name }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following url: <br />
+{{ safe_newmember_name }} has just joined {{ safe_app_name }}. You can visit {{ safe_newmember_name }}'s profile using the following url:
 {{ app_url }}{{ newmember_url }}
 {% endblocktrans %}
 {% endtextcontent %}