summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-10-15 18:20:58 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-10-15 18:20:58 -0300
commiteaa960425d17401e978c7ca54570d31d52ec256c (patch)
treeb0671e295b55237a0c9cc6ef9ec55e594a29e1ae
parentd51bdbe4a5e1013961bfc40ab8c1ed66f66a90b3 (diff)
downloadaskbot-eaa960425d17401e978c7ca54570d31d52ec256c.tar.gz
askbot-eaa960425d17401e978c7ca54570d31d52ec256c.tar.bz2
askbot-eaa960425d17401e978c7ca54570d31d52ec256c.zip
reverted changes in the templates, because I did not understand why they were necessary
-rw-r--r--askbot/templates/email/macros.html24
-rw-r--r--askbot/templates/email/post_as_subthread.html4
2 files changed, 14 insertions, 14 deletions
diff --git a/askbot/templates/email/macros.html b/askbot/templates/email/macros.html
index 4ad3188f..125705e2 100644
--- a/askbot/templates/email/macros.html
+++ b/askbot/templates/email/macros.html
@@ -14,9 +14,9 @@
{% if is_leaf_post %}
{% trans %}Question by {{ author }}:{% endtrans %}
{% else %}
- {% trans %}
+ {% trans -%}
In reply to {{ author }}'s question:
- {% endtrans %}
+ {%- endtrans %}
{% endif %}
{% else %}
{% trans %}Question :{% endtrans %}
@@ -39,13 +39,13 @@
<p style="font-size:10px; font-weight: bold;">
{% if format == 'parent_subthread' %}
{% if is_leaf_post %}
- {% trans %}
+ {% trans -%}
{{ author }}'s answer:
- {% endtrans %}
+ {%- endtrans %}
{% else %}
- {% trans %}
+ {% trans -%}
In reply to {{ author }}'s answer:
- {% endtrans %}
+ {%- endtrans %}
{% endif %}
{% else %}
{% trans %}Answered by {{ author }}:{% endtrans %}
@@ -55,18 +55,18 @@
<p style="font-size:10px; font-weight: bold;">
{% if format == 'parent_subthread' %}
{% if is_leaf_post %}
- {% trans %}
+ {% trans -%}
{{ author }}'s comment:
- {% endtrans %}
+ {%- endtrans %}
{% else %}
- {% trans %}
+ {% trans -%}
In reply to {{ author }}'s comment:
- {% endtrans %}
+ {%- endtrans %}
{% endif %}
{% else %}
- {% trans author %}
+ {% trans author -%}
Commented by {{ author }}:
- {% endtrans %}
+ {%- endtrans %}
{% endif %}
</p>
{% endif %}
diff --git a/askbot/templates/email/post_as_subthread.html b/askbot/templates/email/post_as_subthread.html
index ad7cabd3..4a4bd047 100644
--- a/askbot/templates/email/post_as_subthread.html
+++ b/askbot/templates/email/post_as_subthread.html
@@ -7,9 +7,9 @@
<p>
{% trans count=comments|length -%}
{{ comment }} comment:
- {% pluralize %}
+ {%- pluralize -%}
{{ count }} comments:
- {% endtrans %}
+ {%- endtrans -%}
</p>
{% for comment in comments %}
{{ quoted_post(comment, quote_level = 1) }}