Commit 8d5b73a3 authored by root's avatar root

parent 4498dc30
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
<div id="main-body" style="width:100%"> <div id="main-body" style="width:100%">
<p> <p>
{% if suser %} {% if suser %}
{% blocktrans %}users matching query {{suser}}:{% endblocktrans %} {% blocktrans %}users matching query '{{suser}}':{% endblocktrans %}
{% endif %} {% endif %}
{% if not users.paginator.count %} {% if not users.paginator.count %}
<span>{% trans "Nothing found." %}</span> <span>{% trans "Nothing found" %}</span>
{% endif %} {% endif %}
</p> </p>
<div class="userList"> <div class="userList">
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<br/> <br/>
<div id="navBar"><div class="tabsA"> <div id="navBar"><div class="tabsA">
<a href='{{ view_user.get_user_subscriptions_url }}?tab=settings' id="subscriptions_settings_button" {% if not manage_open %}class="on"{% endif %}>Settings</a> <a href='{{ view_user.get_user_subscriptions_url }}?tab=settings' id="subscriptions_settings_button" {% if not manage_open %}class="on"{% endif %}>{% trans "Settings" %}</a>
<a href='{{ view_user.get_user_subscriptions_url }}?tab=manage' id="subscriptions_management_button" {% if manage_open %}class="on"{% endif %}>Manage</a> <a href='{{ view_user.get_user_subscriptions_url }}?tab=manage' id="subscriptions_management_button" {% if manage_open %}class="on"{% endif %}>{% trans "manage" %}</a>
</div></div> </div></div>
<br/> <br/>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
{% endif %} {% endif %}
{% if not users.paginator.count %} {% if not users.paginator.count %}
<span>{% trans "Nothing found." %}</span> <span>{% trans "Nothing found" %}</span>
{% endif %} {% endif %}
</p> </p>
<div class="userList"> <div class="userList">
......
...@@ -158,20 +158,20 @@ def diff_date(date, limen=2): ...@@ -158,20 +158,20 @@ def diff_date(date, limen=2):
minutes = int(diff.seconds/60) minutes = int(diff.seconds/60)
if date.year != now.year: if date.year != now.year:
return dateformat.format(date, 'd M \'y, H:i') return dateformat.format(date, _("d M 'y, H:i"))
elif days > 2: elif days > 2:
return dateformat.format(date, 'd M, H:i') return dateformat.format(date, _("d M, H:i"))
elif days == 2: elif days == 2:
return _('2 days ago') return _('2 days ago')
elif days == 1: elif days == 1:
return _('yesterday') return _('yesterday')
elif minutes >= 60: elif minutes >= 60:
return ungettext('%(hr)d ' + _("hour ago"), '%(hr)d ' + _("hours ago"), hours) % {'hr':hours} return ungettext("%(hr)d hour ago", "%(hr)d hours ago", hours) % {'hr':hours}
elif diff.seconds >= 60: elif diff.seconds >= 60:
return ungettext('%(min)d ' + _("min ago"), '%(min)d ' + _("mins ago"), minutes) % {'min':minutes} return ungettext("%(min)d min ago", "%(min)d mins ago", minutes) % {'min':minutes}
else: else:
return ungettext('%(sec)d ' + _("sec ago"), '%(sec)d ' + _("secs ago"), diff.seconds) % {'sec':diff.seconds} return ungettext("%(sec)d sec ago", "%(sec)d secs ago", diff.seconds) % {'sec':diff.seconds}
@register.simple_tag @register.simple_tag
def media(url): def media(url):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment