summaryrefslogtreecommitdiffstats
path: root/forum/skins/default/templates
diff options
context:
space:
mode:
Diffstat (limited to 'forum/skins/default/templates')
-rw-r--r--forum/skins/default/templates/post_contributor_info.html6
-rw-r--r--forum/skins/default/templates/question.html23
-rw-r--r--forum/skins/default/templates/user_stats.html16
3 files changed, 9 insertions, 36 deletions
diff --git a/forum/skins/default/templates/post_contributor_info.html b/forum/skins/default/templates/post_contributor_info.html
index 9997be5f..3fc3f400 100644
--- a/forum/skins/default/templates/post_contributor_info.html
+++ b/forum/skins/default/templates/post_contributor_info.html
@@ -6,11 +6,7 @@
{% if wiki %}
<p>{% trans "community wiki" %}</p>
<p>
- {% blocktrans count post.revisions.all|length as rev_count %}
- one revision
- {% plural %}
- {{rev_count}} revisions
- {% endblocktrans %}
+ {% blocktrans count post.revisions.all|length as rev_count %}one revision{% plural %}{{rev_count}} revisions{% endblocktrans %}
</p>
<p>{{post.author.get_profile_link}}</p>
{% else %}
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 79ff9a5b..48b6d719 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -195,16 +195,9 @@
{% endif %}
{% if question.comment_count > 5 %}
{% if request.user|can_add_comments:question %}/
- {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
- see <strong>one</strong> more
- {% plural %}
- see <strong>{{counter}}</strong> more
- {% endblocktrans %}
+ {% blocktrans count question.get_comments|slice:"5:"|length as counter %}see <strong>one</strong> more{% plural %}see <strong>{{counter}}</strong> more{% endblocktrans %}
{% else %}
- {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
- see <strong>one</strong> more comment
- {% plural %}
- see <strong>{{counter}}</strong> more comments
+ {% blocktrans count question.get_comments|slice:"5:"|length as counter %}see <strong>one</strong> more comment{% plural %}see <strong>{{counter}}</strong> more comments
{% endblocktrans %}
{% endif %}
{% endif %}</a>
@@ -344,17 +337,9 @@
{% endif %}
{% if answer.comment_count > 5 %}
{% if request.user|can_add_comments:answer %}/
- {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
- see <strong>one</strong> more
- {% plural %}
- see <strong>{{counter}}</strong> more
- {% endblocktrans %}
+ {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}see <strong>one</strong> more{% plural %}see <strong>{{counter}}</strong> more{% endblocktrans %}
{% else %}
- {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
- see <strong>one</strong> more comment
- {% plural %}
- see <strong>{{counter}}</strong> more comments
- {% endblocktrans %}
+ {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}see <strong>one</strong> more comment{% plural %} see <strong>{{counter}}</strong> more comments{% endblocktrans %}
{% endif %}
{% endif %}</a>
{% endif %}
diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html
index 482b1228..269230c7 100644
--- a/forum/skins/default/templates/user_stats.html
+++ b/forum/skins/default/templates/user_stats.html
@@ -43,11 +43,7 @@
{% endspaceless %}
{% if answered_question.comment_count %}
<span>
- {% blocktrans count answered_question.comment_count as comment_count %}
- (one comment)
- {% plural %}
- the answer has been commented {{comment_count}} times
- {% endblocktrans %}
+ {% blocktrans count answered_question.comment_count as comment_count %}(one comment){% plural %}the answer has been commented {{comment_count}} times{% endblocktrans %}
</span>
{% endif %}
</div>
@@ -84,11 +80,7 @@
<a name="tags"></a>
{% spaceless %}
<h2>
- {% blocktrans count user_tags|length as counter %}
- <span class="count">1</span> Tag
- {% plural %}
- <span class="count">{{counter}}</span> Tags
- {% endblocktrans %}
+ {% blocktrans count user_tags|length as counter %}<span class="count">1</span> Tag{% plural %}<span class="count">{{counter}}</span> Tags{% endblocktrans %}
</h2>
{% endspaceless %}
<div class="user-stats-table">
@@ -97,8 +89,8 @@
<td width="180" valign="top">
{% for tag in user_tags%}
<a rel="tag"
- title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}"
- href="{% url questions %}?tags={{tag|urlencode}}&author={{view_user.id}}&start_over=true">{{tag.name}}</a>
+ title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}"
+ href="{% url questions %}?tags={{tag|urlencode}}&author={{view_user.id}}&start_over=true">{{tag.name}}</a>
<span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
{% if forloop.counter|divisibleby:"10" %}
</td>