Improving the canned comments feature, now we can use Django style template syntax...

[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 8efbe7281e960a2d408b3cf22821b7a9df4c5a9a..aa5d5ec2bf949f6d5e5e35bdaf7b911c42fbab84 100644 (file)
--- a/forum/skins/default/templates/notifications/newmember.html
+++ b/forum/skins/default/templates/notifications/newmember.html
@@ -1,13 +1,13 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
 {% load i18n extra_tags email_tags %}
 
 {% declare %}

-    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
-    app_name = settings.APP_SHORT_NAME
-    safe_app_name = html.mark_safe(settings.APP_SHORT_NAME)
-    app_url = settings.APP_URL
-    newmember_name = newmember.username
-    safe_newmember_name = html.mark_safe(newmember.username)
-    newmember_url = newmember.get_profile_url()
+    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(newmember, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
     newmember_link = html.objlink(newmember, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}