Fix more fullurl errors

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

diff --git a/forum/skins/default/templates/notifications/newquestion.html b/forum/skins/default/templates/notifications/newquestion.html
index ae4101758765aca4d571a6bb42cbd94d53fc7554..3425c98b1c05ef4e05cdf3f7af3eeee7b5dab66d 100644 (file)
--- a/forum/skins/default/templates/notifications/newquestion.html
+++ b/forum/skins/default/templates/notifications/newquestion.html
@@ -9,8 +9,8 @@
     question_title = html.mark_safe(smart_str(question.title))
     question_tags = html.mark_safe(smart_str(question.tagnames))
     safe_body = html.html2text(smart_str(question.html))
     question_title = html.mark_safe(smart_str(question.title))
     question_tags = html.mark_safe(smart_str(question.tagnames))
     safe_body = html.html2text(smart_str(question.html))

-    author_link = html.objlink(smart_str(question.author), style=settings.EMAIL_ANCHOR_STYLE)
-    question_link = html.objlink(smart_str(question), style=settings.EMAIL_ANCHOR_STYLE)
+    author_link = html.objlink(question.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)

     tag_links = html.mark_safe(smart_str(" ".join([html.objlink(t, style=settings.EMAIL_ANCHOR_STYLE) for t in question.tags.all()])))
 {% enddeclare %}
 
     tag_links = html.mark_safe(smart_str(" ".join([html.objlink(t, style=settings.EMAIL_ANCHOR_STYLE) for t in question.tags.all()])))
 {% enddeclare %}
 


@@ -19,11 +19,18 @@
 
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">
 
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">

+            {% if tag_links != "" %}

             {% blocktrans %}
             {{ author_link }} has just posted a new question on {{ app_name }}, entitled
             {{ question_link }}
              and tagged "<em>{{ tag_links }}</em>". Here's what it says:
             {% endblocktrans %}
             {% blocktrans %}
             {{ author_link }} has just posted a new question on {{ app_name }}, entitled
             {{ question_link }}
              and tagged "<em>{{ tag_links }}</em>". Here's what it says:
             {% endblocktrans %}

+            {%else%}
+            {% blocktrans %}
+            {{ author_link }} has just posted a new question on {{ app_name }}, entitled
+            {{ question_link }}. Here's what it says:
+            {% endblocktrans %}
+            {%endif%}

         </p>
 
         <blockquote>
         </p>
 
         <blockquote>