diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-03 00:42:09 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-03 00:42:09 -0400 |
| commit | aeb332aa8d42782a13e05bda646cba30f1227f1e (patch) | |
| tree | 336330fbeee11ffb8fcb866f4dbaa855ea873f96 /templates | |
| parent | 01122a277c66d9766c6e519b248790687734169d (diff) | |
| parent | f202c999814eb0c817477529f092a22654e91792 (diff) | |
| download | askbot-aeb332aa8d42782a13e05bda646cba30f1227f1e.tar.gz askbot-aeb332aa8d42782a13e05bda646cba30f1227f1e.tar.bz2 askbot-aeb332aa8d42782a13e05bda646cba30f1227f1e.zip | |
Merged Mikes changes again and phoenix24 fix of python2.5 problem
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/answer_edit_tips.html | 1 | ||||
| -rw-r--r-- | templates/pagesize.html | 2 | ||||
| -rw-r--r-- | templates/paginator.html | 1 | ||||
| -rw-r--r-- | templates/questions.html | 5 |
4 files changed, 3 insertions, 6 deletions
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html index 08d33bc9..565c5298 100644 --- a/templates/answer_edit_tips.html +++ b/templates/answer_edit_tips.html @@ -34,7 +34,6 @@ <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}") </li> - <li> <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}") diff --git a/templates/pagesize.html b/templates/pagesize.html index e5e17a24..90003749 100644 --- a/templates/pagesize.html +++ b/templates/pagesize.html @@ -2,7 +2,7 @@ {% load i18n %} {% if is_paginated %} <div class="paginator"> - <span class="text">{% trans "Size per page:" %}</span> + <span class="text">{% trans "posts per page" %}</span> {% ifequal pagesize 10 %} <span class="curr">10</span> {% else %} diff --git a/templates/paginator.html b/templates/paginator.html index c5e51a81..2fba5425 100644 --- a/templates/paginator.html +++ b/templates/paginator.html @@ -5,7 +5,6 @@ <div class="paginator"> {% if has_previous %}<span class="prev"><a href="{{base_url}}page={{ previous }}{{ extend_url }}" title="{% trans "previous" %}"> « {% trans "previous" %}</a></span>{% endif %} - {% if not in_leading_range %} {% for num in pages_outside_trailing_range %} <span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" >{{ num }}</a></span> diff --git a/templates/questions.html b/templates/questions.html index 21ac18ce..a531d954 100644 --- a/templates/questions.html +++ b/templates/questions.html @@ -1,5 +1,6 @@ <!-- questions.html --> {% extends "base.html" %} +{% load i18n %} {% load extra_tags %} {% load i18n %} {% load humanize %} @@ -138,15 +139,13 @@ <p>{% trans "Questions are sorted by the <strong>number of votes</strong>." %} {% trans "Most voted questions are shown first." %}</p> {% endifequal %} - - </p> </div> <div class="boxC"> <h3 class="subtitle">{% trans "Related tags" %}</h3> <div class="tags"> {% for tag in tags %} - <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a> + <a rel="tag" title="{% blocktrans with tag.name as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a> <span class="tag-number">× {{ tag.used_count|intcomma }}</span> <br> {% endfor %} |