update russion translation (90% translated)
This commit is contained in:
parent
1b60b2d097
commit
dba539ed08
8 changed files with 307 additions and 285 deletions
|
@ -10,4 +10,5 @@ debug_toolbar
|
|||
*.log
|
||||
*~
|
||||
*.kpf
|
||||
*.autosave
|
||||
static/forum/avatars
|
|
@ -208,10 +208,10 @@ class EditPostForm(forms.ModelForm):
|
|||
|
||||
|
||||
class UserSearchForm(forms.Form):
|
||||
username = forms.CharField(required=False)
|
||||
username = forms.CharField(required=False, label=_('Username'))
|
||||
#show_group = forms.ChoiceField(choices=SHOW_GROUP_CHOICES)
|
||||
sort_by = forms.ChoiceField(choices=SORT_USER_BY_CHOICES)
|
||||
sort_dir = forms.ChoiceField(choices=SORT_DIR_CHOICES)
|
||||
sort_by = forms.ChoiceField(choices=SORT_USER_BY_CHOICES, label=_('Sort by'))
|
||||
sort_dir = forms.ChoiceField(choices=SORT_DIR_CHOICES, label=_('Sort order'))
|
||||
|
||||
def filter(self, qs):
|
||||
if self.is_valid():
|
||||
|
@ -237,7 +237,6 @@ class UserSearchForm(forms.Form):
|
|||
elif sort_dir=='DESC':
|
||||
#qs = qs.filter(username__contains=username).order_by('-posts')
|
||||
qs.query.group_by = ['username']
|
||||
print qs
|
||||
return qs
|
||||
else:
|
||||
return qs
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -11,7 +11,7 @@
|
|||
<div class="nosize"><!-- --></div>
|
||||
</div>
|
||||
<div class="tclcon">
|
||||
<h3>{% link forum %} <a href="{% url forum_feed "forum" %}{{ forum.id }}"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="float:right;" /></a></h3>
|
||||
<h3>{% link forum %} <a href="{% url forum_feed "forum" %}{{ forum.id }}/"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="float:right;" /></a></h3>
|
||||
{{ forum.description|safe }}
|
||||
|
||||
<p>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<li id="navuserlist"><a href="{% url forum_users %}">{% trans "User list" %}</a></li>
|
||||
<li id="navsearch"><a href="{% url search %}">{% trans "Search" %}</a></li>
|
||||
{% if user.is_superuser %}
|
||||
<li id="navadmin"><a href="{% url admincp "" %}">{% trans "Administration" %}</a></li>
|
||||
<li id="navadmin"><a href="{% url admincp "." %}">{% trans "Administration" %}</a></li>
|
||||
{% endif %}
|
||||
{% if user.is_authenticated %}
|
||||
<li id="navprofile"><a href="{% url forum_profile request.user %}">{% trans "Profile" %}</a></li>
|
||||
|
@ -41,7 +41,7 @@
|
|||
<li>{% trans "You are not logged in." %}</li>
|
||||
{% endif %}
|
||||
{% if user.is_superuser and reports %}
|
||||
<li class="reportlink"><strong><a href="{% url admincp "" %}">{% trans "There are new reports" %} ({% new_reports %})</a></strong></li>
|
||||
<li class="reportlink"><strong><a href="{% url admincp "." %}">{% trans "There are new reports" %} ({% new_reports %})</a></strong></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% if user.is_authenticated %}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<div id="idx1" class="blocktable">
|
||||
{% for iter in cats %}
|
||||
<h2>
|
||||
<a href="{% url forum_feed "category" %}{{ iter.cat.id }}"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="float:right;" /></a>
|
||||
<a href="{% url forum_feed "category" %}{{ iter.cat.id }}/"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="float:right;" /></a>
|
||||
<span>{{ iter.cat }}</span>
|
||||
</h2>
|
||||
<div class="box">
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<p class="postlink conr"><a href="{% url add_post topic.id %}">Ответить</a></p>
|
||||
{% endif %}
|
||||
<ul><li><a href="{% url index %}">{% trans "Root" %} </a></li><li>» {% link topic.forum %} </li><li>» {{ topic }}
|
||||
<a href="{% url forum_feed "topic" %}{{ topic.id }}"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="vertical-align:middle;" /></a>
|
||||
<a href="{% url forum_feed "topic" %}{{ topic.id }}/"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" style="vertical-align:middle;" /></a>
|
||||
</li></ul>
|
||||
|
||||
<div class="clearer"></div>
|
||||
|
|
Reference in a new issue