Template cleanup

misago/templates/misago/admin/forumroles/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New role" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target.name }}
+  {{ target }}
   {% else %}
   {% trans "New role" %}
   {% endif %}

misago/templates/misago/admin/forumroles/forumroles.html

@@ -33,7 +33,7 @@
       {% for form in forms %}
       <tr>
         <td class="item-name">
-          {{ form.role.name }}
+          {{ form.role }}
         </td>
         <td>
           {% crispy_field form.forum_role %}

misago/templates/misago/admin/forumroles/list.html

@@ -21,7 +21,7 @@
 
 {% block table-row %}
 <td class="item-name">
-  {{ item.name }}
+  {{ item }}
 </td>
 <td class="row-action">
   <a href="{% url 'misago:admin:permissions:forums:edit' role_id=item.id %}" class="btn btn-primary tooltip-top" title="{% trans "Edit" %}">

misago/templates/misago/admin/forumroles/roleforums.html

@@ -43,7 +43,7 @@
           {% elif form.forum.role == 'redirect' %}
           <span class="fa fa-link tooltip-top" title="{% trans "Redirect" %}"></span>
           {% endif %}
-          {{ form.forum.name }}
+          {{ form.forum }}
         </td>
         <td>
           {% crispy_field form.role %}

misago/templates/misago/admin/forums/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New forum" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New forum" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target.name }}
+  {{ target }}
   {% else %}
   {% trans "New forum" %}
   {% endif %}

misago/templates/misago/admin/forums/list.html

@@ -36,7 +36,7 @@
   {% elif item.role == 'redirect' %}
   <span class="fa fa-link tooltip-top" title="{% trans "Redirect" %}"></span>
   {% endif %}
-  {{ item.name }}
+  {{ item }}
 </td>
 <td class="row-action">
   {% if not item.last %}

misago/templates/misago/admin/labels/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New label" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New label" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target.name }}
+  {{ target }}
   {% else %}
   {% trans "New label" %}
   {% endif %}

misago/templates/misago/admin/labels/list.html

@@ -25,7 +25,7 @@
 
 {% block table-row %}
 <td class="item-name">
-  {{ item.name }}
+  {{ item }}
 </td>
 <td>{% if item.css_class %}{{ item.css_class }}{% else %}&nbsp;{% endif %}</td>
 {% for action in extra_actions %}

misago/templates/misago/admin/navbar.html

@@ -17,7 +17,7 @@
         <p class="navbar-text">
           <a href="{% url 'misago:admin:users:accounts:edit' user_id=user.id %}" class="tooltip-bottom" title="{% trans "Edit your account" %}">
             <img src="{{ user|avatar:30 }}" alt="{% trans "Your avatar" %}">
-            {{ user.username }}
+            {{ user }}
           </a>
           <a href="#" class="logout" data-toggle="modal" data-target="#logout-modal">
             <span class="fa fa-power-off"></span>

misago/templates/misago/admin/ranks/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New rank" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New rank" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target.name }}
+  {{ target }}
   {% else %}
   {% trans "New rank" %}
   {% endif %}

misago/templates/misago/admin/ranks/list.html

@@ -30,7 +30,7 @@
 
 {% block table-row %}
 <td class="item-name">
-  {{ item.name }}
+  {{ item }}
 </td>
 <td>
   {% if item.title %}

misago/templates/misago/admin/roles/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{{ target.name }}
+{{ target }}
 {% else %}
 {% trans "New role" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {{ target.name }}
+  {{ target }}
   {% else %}
   {% trans "New role" %}
   {% endif %}

misago/templates/misago/admin/roles/list.html

@@ -25,7 +25,7 @@
 
 {% block table-row %}
 <td class="item-name">
-  {{ item.name }}
+  {{ item }}
 </td>
 {% for action in extra_actions %}
 <td class="row-action">

misago/templates/misago/admin/users/ban_users.html

@@ -18,7 +18,7 @@
 </h1>
 <p>
   {% for user in users %}
-  <img src="{{ user|avatar:24 }}" class="img-rounded tooltip-top" alt="{{ user.username }}" width="24" height="24" title="{{ user.username }}">
+  <img src="{{ user|avatar:24 }}" class="img-rounded tooltip-top" alt="{{ user }}" width="24" height="24" title="{{ user }}">
   {% endfor %}
 </p>
 {% endblock %}

misago/templates/misago/admin/users/edit.html

@@ -3,18 +3,18 @@
 
 
 {% block title %}
-{{ target.username }} | {{ active_link.name }} | {{ block.super }}
+{{ target }} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
 {% block page-target %}
-{{ target.username }}
+{{ target }}
 {% endblock page-target %}
 
 
 {% block form-header %}
 <h1>
-  {{ target.username }}
+  {{ target }}
 </h1>
 {% endblock %}
 

misago/templates/misago/admin/users/list.html

@@ -35,7 +35,7 @@
   </a>
 </td>
 <td class="item-name {% if item.requires_activation %}text-muted{% endif %}">
-  <a href="{{ item.get_absolute_url }}">{{ item.username }}</a>
+  <a href="{{ item.get_absolute_url }}">{{ item }}</a>
 </td>
 <td class="lead text-muted">
   {% if item.requires_activation_by_admin %}
@@ -59,7 +59,7 @@
   <a href="mailto:{{ item.email }}">{{ item.email }}</a>
 </td>
 <td>
-  {{ item.rank.name }}
+  {{ item.rank }}
 </td>
 <td>
   <abbr class="tooltip-top dynamic time-ago" title="{{ item.joined_on }}" data-timestamp="{{ item.joined_on|date:"c" }}">

misago/templates/misago/admin/warnings/form.html

@@ -4,7 +4,7 @@
 
 {% block title %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target }}
 {% else %}
 {% trans "New warning level" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 {% block page-target %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target }}
 {% else %}
 {% trans "New warning level" %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 <h1>
   {% if target.pk %}
-  {% trans target.name %}
+  {{ target }}
   {% else %}
   {% trans "New warning level" %}
   {% endif %}

misago/templates/misago/admin/warnings/list.html

@@ -29,7 +29,7 @@
 
 {% block table-row %}
 <td class="item-name">
-  #{{ forloop.counter }} {{ item.name }}
+  #{{ forloop.counter }} {{ item }}
 </td>
 <td>{{ item.length }}</td>
 <td>

misago/templates/misago/emails/activation/by_admin.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, your account has been activated by forum administrator.
 {% endblocktrans %}
 <br>

misago/templates/misago/emails/activation/by_admin.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, your account has been activated by forum administrator.
 {% endblocktrans %}
 

misago/templates/misago/emails/activation/by_user.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, to activate your account click the below link:
 {% endblocktrans %}
 <br>

misago/templates/misago/emails/activation/by_user.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, to activate your account click the below link:
 {% endblocktrans %}
 {{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.id token=activation_token %}"

misago/templates/misago/emails/change_email_password.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, you are receiving this message because you have made changes in your account email and password.
 {% endblocktrans %}
 <br>

misago/templates/misago/emails/change_email_password.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, you are receiving this message because you have made changes in your account email and password.
 {% endblocktrans %}
 

misago/templates/misago/emails/change_password_form_link.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, you are receiving this message because you want to change forgotten password for your forum account.
 {% endblocktrans %}
 <br>

misago/templates/misago/emails/change_password_form_link.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, you are receiving this message because you want to change forgotten password for your forum account.
 {% endblocktrans %}
 

misago/templates/misago/emails/register/complete.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, thank you for joining us!
 {% endblocktrans %}
 <br>

misago/templates/misago/emails/register/complete.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, thank you for joining us!
 {% endblocktrans %}
 

misago/templates/misago/emails/register/inactive.txt

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-{% blocktrans trimmed with user=recipient.username %}
+{% blocktrans trimmed with user=recipient %}
 {{ user }}, thank you for joining us!
 {% endblocktrans %}
 {% if activation_by_admin %}

misago/templates/misago/forgottenpassword/reset_password_form.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 
-{% block title %}{% blocktrans trimmed with user=requesting_user.username %}
+{% block title %}{% blocktrans trimmed with user=requesting_user %}
 Set new password for {{ user }}
 {% endblocktrans %} | {{ block.super }}{% endblock %}
 
@@ -12,7 +12,7 @@ Set new password for {{ user }}
   <div class="container">
     <h1>
       <span class="fa fa-key">
-      {% blocktrans trimmed with user=requesting_user.username %}
+      {% blocktrans trimmed with user=requesting_user %}
       Set new password for {{ user }}
       {% endblocktrans %}
     </h1>

misago/templates/misago/forums/categories.html

@@ -4,7 +4,7 @@
   {% if category.subforums %}
   <div id="{{ category.slug }}-{{ category.pk }}" class="panel panel-default panel-shadow panel-forums {{ category.css_class }}">
     <div class="panel-heading">
-      <h3 class="panel-title">{{ category.name }}</h3>
+      <h3 class="panel-title">{{ category }}</h3>
     </div>
     {% include "misago/forums/forums.html" with forums=category.subforums %}
   </div>

misago/templates/misago/forums/category.html

@@ -2,7 +2,7 @@
 {% load i18n misago_stringutils %}
 
 
-{% block title %}{{ category.name }} | {{ block.super }}{% endblock title %}
+{% block title %}{{ category }} | {{ block.super }}{% endblock title %}
 
 
 {% block meta-description %}{{ category.description|striplinebreaks }}{% endblock meta-description %}
@@ -16,13 +16,13 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
         </li>
         {% endfor %}
       </ol>
       {% endif %}
 
-      <h1>{{ category.name }}</h1>
+      <h1>{{ category }}</h1>
     </div>
   </div>
   <div class="container">

misago/templates/misago/forums/forums.html

@@ -8,7 +8,7 @@
     <span class="forum-icon fa fa-comment{% if forum.is_read %}-o{% else %} new{% endif %} fa-fw tooltip-top" title="{% if forum.is_read %}{% trans "Forum has no new posts." %}{% else %}{% trans "Forum has new posts." %}{% endif %}"></span>
     {% endif %}
 
-    <a href="{{ forum.get_absolute_url }}" class="item-title forum-name">{{ forum.name }}</a>
+    <a href="{{ forum.get_absolute_url }}" class="item-title forum-name">{{ forum }}</a>
 
     <div class="sr-only forum-description">
       {% if forum.description %}
@@ -89,7 +89,7 @@
             {% else %}
             <span class="forum-icon fa fa-comment{% if subforum.is_read %}-o{% else %} new{% endif %} fa-fw "></span>
             {% endif %}
-            {{ subforum.name }}
+            {{ subforum }}
           </a>
         </li>
         {% endfor %}

misago/templates/misago/modusers/avatar.html

@@ -3,7 +3,7 @@
 
 
 {% block title %}
-{{ profile.username }}: {% trans "Avatar" %} | {{ block.super }}
+{{ profile }}: {% trans "Avatar" %} | {{ block.super }}
 {% endblock title %}
 
 

misago/templates/misago/modusers/ban.html

@@ -3,7 +3,7 @@
 
 
 {% block title %}
-{{ profile.username }}: {% trans "Ban user" %} | {{ block.super }}
+{{ profile }}: {% trans "Ban user" %} | {{ block.super }}
 {% endblock title %}
 
 
@@ -23,7 +23,7 @@
 
         <div class="form-header">
           <h2>
-            {% blocktrans trimmed with user=profile.username %}
+            {% blocktrans trimmed with user=profile %}
             Ban {{ user }}
             {% endblocktrans %}
           </h2>

misago/templates/misago/modusers/base.html

@@ -10,7 +10,7 @@
       <div class="main">
         <img src="{{ profile|avatar:20 }}" alt="{% trans "Avatar" %}">
         <a href="{% url USER_PROFILE_URL user_slug=profile.slug user_id=profile.id %}">
-          {{ profile.username }}
+          {{ profile }}
         </a>
       </div>
       <div class="sub">

misago/templates/misago/modusers/rename.html

@@ -3,7 +3,7 @@
 
 
 {% block title %}
-{{ profile.username }}: {% trans "Rename user" %} | {{ block.super }}
+{{ profile }}: {% trans "Rename user" %} | {{ block.super }}
 {% endblock title %}
 
 
@@ -23,7 +23,7 @@
 
         <div class="form-header">
           <h2>
-            {% blocktrans trimmed with user=profile.username %}
+            {% blocktrans trimmed with user=profile %}
             Rename {{ user }}
             {% endblocktrans %}
           </h2>

misago/templates/misago/modusers/signature.html

@@ -3,7 +3,7 @@
 
 
 {% block title %}
-{{ profile.username }}: {% trans "Signature" %} | {{ block.super }}
+{{ profile }}: {% trans "Signature" %} | {{ block.super }}
 {% endblock title %}
 
 
@@ -32,7 +32,7 @@
         <div class="form-body form-markup-preview">
           {% if not profile.signature %}
           <p class="lead">
-            {% blocktrans trimmed with user=profile.username %}
+            {% blocktrans trimmed with user=profile %}
             {{ user }} has no signature set.
             {% endblocktrans %}
           </p>

misago/templates/misago/modusers/warn.html

@@ -3,7 +3,7 @@
 
 
 {% block title %}
-{{ profile.username }}: {% trans "Warn" %} | {{ block.super }}
+{{ profile }}: {% trans "Warn" %} | {{ block.super }}
 {% endblock title %}
 
 
@@ -64,7 +64,7 @@
       <div class="panel-body thin">
 
         {% if current_level %}
-          <h4>{{ current_level.name }}</h4>
+          <h4>{{ current_level }}</h4>
 
           {% if current_level.is_replying_disallowed %}
           <p>
@@ -118,7 +118,7 @@
       </div>
       <div class="panel-body thin">
 
-        <h4>{{ next_level.name }}</h4>
+        <h4>{{ next_level }}</h4>
 
         {% if next_level.is_replying_disallowed %}
         <p>

misago/templates/misago/posting/form.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 
-{% block title %}{% trans "Start new thread" %} | {{ forum.name }} | {{ block.super }}{% endblock title %}
+{% block title %}{% trans "Start new thread" %} | {{ forum }} | {{ block.super }}{% endblock title %}
 
 
 {% block content %}
@@ -13,7 +13,7 @@
       <ol class="breadcrumb">
         {% for crumb in path %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
         </li>
         {% endfor %}
       </ol>
@@ -21,7 +21,7 @@
 
       <h1>
         <span class="main">
-          <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a>
+          <a href="{{ forum.get_absolute_url }}">{{ forum }}</a>
         </span>
         <span class="sub">
           <span class="fa fa-chevron-right"></span>

misago/templates/misago/profile/ban_details.html

@@ -7,11 +7,11 @@
   <p class="lead pull-left">
     <span class="fa fa-lock"></span>
     {% if ban.valid_until %}
-    {% blocktrans trimmed with user=profile.username banned_until=ban.valid_until %}
+    {% blocktrans trimmed with user=profile banned_until=ban.valid_until %}
     {{ user }} is banned until after {{ banned_until }}.
     {% endblocktrans %}
     {% else %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     {{ user }} is banned permanently.
     {% endblocktrans %}
     {% endif %}

misago/templates/misago/profile/base.html

@@ -2,10 +2,10 @@
 {% load i18n %}
 
 
-{% block title %}{{ profile.username }}: {{ active_page.name }} {% if page_number > 1 %}({% blocktrans with page=page_number %}Page {{ number }}{% endblocktrans %}) {% endif %}| {{ block.super }}{% endblock title %}
+{% block title %}{{ profile }}: {{ active_page.name }} {% if page_number > 1 %}({% blocktrans with page=page_number %}Page {{ number }}{% endblocktrans %}) {% endif %}| {{ block.super }}{% endblock title %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username joined_on=profile.joined_on|date %}
+{% block meta-description %}{% blocktrans trimmed with user=profile joined_on=profile.joined_on|date %}
 {{ user }} is member since {{ joined_on }}.
 {% endblocktrans %}{% endblock meta-description %}
 

misago/templates/misago/profile/followers.html

@@ -2,7 +2,7 @@
 {% load humanize i18n misago_avatars misago_pagination %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username followers=profile.followers|intcomma count counter=profile.followers %}
+{% block meta-description %}{% blocktrans trimmed with user=profile followers=profile.followers|intcomma count counter=profile.followers %}
 {{ user }} is followed by {{ followers }} user.
 {% plural %}
 {{ user }} is followed by {{ followers }} users.
@@ -19,7 +19,7 @@
       You are followed by {{ followers }} users.
       {% endblocktrans %}
     {% else %}
-      {% blocktrans trimmed with user=profile.username followers=profile.followers|intcomma count counter=profile.followers %}
+      {% blocktrans trimmed with user=profile followers=profile.followers|intcomma count counter=profile.followers %}
       {{ user }} is followed by {{ followers }} user.
       {% plural %}
       {{ user }} is followed by {{ followers }} users.
@@ -31,11 +31,11 @@
 {% else %}
 <p class="lead">
   {% if is_authenticated_user %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     No users are following you, {{ user }}.
     {% endblocktrans %}
   {% else %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     {{ user }} has no followers.
     {% endblocktrans %}
   {% endif %}

misago/templates/misago/profile/follows.html

@@ -3,7 +3,7 @@
 
 
 {% block meta-description %}
-{% blocktrans trimmed with user=profile.username follows=profile.following|intcomma count counter=profile.following %}
+{% blocktrans trimmed with user=profile follows=profile.following|intcomma count counter=profile.following %}
 {{ user }} is following {{ follows }} user.
 {% plural %}
 {{ user }} is following {{ follows }} users.
@@ -20,7 +20,7 @@
       You are following {{ follows }} users.
       {% endblocktrans %}
     {% else %}
-      {% blocktrans trimmed with user=profile.username follows=profile.following|intcomma count counter=profile.following %}
+      {% blocktrans trimmed with user=profile follows=profile.following|intcomma count counter=profile.following %}
       {{ user }} is following {{ follows }} user.
       {% plural %}
       {{ user }} is following {{ follows }} users.
@@ -32,11 +32,11 @@
 {% else %}
 <p class="lead">
   {% if is_authenticated_user %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     Your are not following any users, {{ user }}.
     {% endblocktrans %}
   {% else %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     {{ user }} follows no users.
     {% endblocktrans %}
   {% endif %}

misago/templates/misago/profile/header.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <h1 class="user-name">
-  {{ profile.username }}
+  {{ profile }}
   {% if profile.title or profile.rank.is_tab %}
   <small class="user-title">
     {% if profile.rank.is_tab %}

misago/templates/misago/profile/name_history.html

@@ -2,7 +2,7 @@
 {% load humanize i18n misago_avatars misago_capture misago_pagination %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username changes=name_changes.paginator.count|intcomma joined_on=profile.joined_on|date count counter=name_changes.paginator.count %}
+{% block meta-description %}{% blocktrans trimmed with user=profile changes=name_changes.paginator.count|intcomma joined_on=profile.joined_on|date count counter=name_changes.paginator.count %}
 {{ user }} username was changed {{ changes }} time since {{ joined_on }}.
 {% plural %}
 {{ user }} username was changed {{ changes }} times since {{ joined_on }}.
@@ -19,7 +19,7 @@
       Your username was changed {{ changes }} times.
       {% endblocktrans %}
     {% else %}
-      {% blocktrans trimmed with user=profile.username changes=name_changes.paginator.count|intcomma count counter=name_changes.paginator.count %}
+      {% blocktrans trimmed with user=profile changes=name_changes.paginator.count|intcomma count counter=name_changes.paginator.count %}
       {{ user }} username was changed {{ changes }} time.
       {% plural %}
       {{ user }} username was changed {{ changes }} times.
@@ -54,7 +54,7 @@
         {{ changed_by }} changed {{ old_username }}'s name to {{ new_username }}
         {% endblocktrans %}
       {% else %}
-        <img src="{{ profile.pk|avatar:22 }}" class="tooltip-top" title="{{ profile.username }}">
+        <img src="{{ profile.pk|avatar:22 }}" class="tooltip-top" title="{{ profile }}">
         {% blocktrans trimmed with old_username=old_username|safe new_username=new_username|safe %}
         {{ old_username }} changed name to {{ new_username }}
         {% endblocktrans %}
@@ -71,11 +71,11 @@
 {% else %}
 <p class="lead">
   {% if is_authenticated_user %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     Your username was never changed, {{ user }}.
     {% endblocktrans %}
   {% else %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     {{ user }}'s username was never changed.
     {% endblocktrans %}
   {% endif %}

misago/templates/misago/profile/posts.html

@@ -2,7 +2,7 @@
 {% load humanize i18n %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username posts=profile.posts|intcomma joined_on=profile.joined_on|date count counter=profile.posts %}
+{% block meta-description %}{% blocktrans trimmed with user=profile posts=profile.posts|intcomma joined_on=profile.joined_on|date count counter=profile.posts %}
 {{ user }} has posted {{ posts }} message since {{ joined_on }}.
 {% plural %}
 {{ user }} has posted {{ posts }} messages since {{ joined_on }}.
@@ -11,7 +11,7 @@
 
 {% block page %}
 <p class="lead">
-  {% blocktrans trimmed with user=profile.username %}
+  {% blocktrans trimmed with user=profile %}
   {{ user }} posted no messages, or you can't see them.
   {% endblocktrans %}
 </p>

misago/templates/misago/profile/threads.html

@@ -2,7 +2,7 @@
 {% load humanize i18n %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username threads=profile.threads|intcomma joined_on=profile.joined_on|date count counter=profile.threads %}
+{% block meta-description %}{% blocktrans trimmed with user=profile threads=profile.threads|intcomma joined_on=profile.joined_on|date count counter=profile.threads %}
 {{ user }} has started {{ threads }} thread since {{ joined_on }}.
 {% plural %}
 {{ user }} has started {{ threads }} threads since {{ joined_on }}.
@@ -11,7 +11,7 @@
 
 {% block page %}
 <p class="lead">
-  {% blocktrans trimmed with user=profile.username %}
+  {% blocktrans trimmed with user=profile %}
   {{ user }} started no threads, or you can't see them.
   {% endblocktrans %}
 </p>

misago/templates/misago/profile/warnings.html

@@ -2,7 +2,7 @@
 {% load humanize i18n misago_avatars misago_capture misago_dates misago_pagination %}
 
 
-{% block meta-description %}{% blocktrans trimmed with user=profile.username warnings=warnings.paginator.count|intcomma joined_on=profile.joined_on|date count counter=warnings.paginator.count %}
+{% block meta-description %}{% blocktrans trimmed with user=profile warnings=warnings.paginator.count|intcomma joined_on=profile.joined_on|date count counter=warnings.paginator.count %}
 {{ user }} was warned {{ warnings }} time since {{ joined_on }}.
 {% plural %}
 {{ user }} was warned {{ warnings }} times since {{ joined_on }}.
@@ -14,7 +14,7 @@
   <div class="warning-summary">
     {% if warning_level %}
       <p class="lead">
-        {{ warning_level.name }}
+        {{ warning_level }}
       </p>
 
       {% if warning_level.has_restrictions %}
@@ -173,11 +173,11 @@
 {% else %}
 <p class="lead">
   {% if is_authenticated_user %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     Your have no warnings, {{ user }}.
     {% endblocktrans %}
   {% else %}
-    {% blocktrans trimmed with user=profile.username %}
+    {% blocktrans trimmed with user=profile %}
     {{ user }} has no warnings.
     {% endblocktrans %}
   {% endif %}

misago/templates/misago/ranks_online.html

@@ -15,7 +15,7 @@
           <span>{{ user.username }}</span>
           {% if user.title %}
           <small>{{ user.title }}</small>
-          {% elif rank.title %}
+          {% elif rank %}
           <small>{{ rank.title }}</small>
           {% endif %}
         </a>

misago/templates/misago/register/completed.html

@@ -20,7 +20,7 @@
 
     {% if activation_by_user %}
     <p class="lead">
-      {% blocktrans trimmed with user=registered_user.username %}
+      {% blocktrans trimmed with user=registered_user %}
       {{ user }}, your account has been created, but you have to activate it before you will be able to sign in.
       {% endblocktrans %}
     </p>
@@ -31,7 +31,7 @@
     </p>
     {% elif activation_by_admin %}
     <p class="lead">
-      {% blocktrans trimmed with user=registered_user.username %}
+      {% blocktrans trimmed with user=registered_user %}
       {{ user }}, your account has been created, but administrator has to activate it before you will be able to sign in.
       {% endblocktrans %}
     </p>

misago/templates/misago/thread/full_path.html

@@ -1,8 +1,8 @@
 {% for crumb in path %}
 <li>
-  <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a><span class="fa fa-chevron-right"></span>
+  <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a><span class="fa fa-chevron-right"></span>
 </li>
 {% endfor %}
 <li>
-  <a href="{{ thread.get_absolute_url }}">{{ thread.title }}</a>
+  <a href="{{ thread.get_absolute_url }}">{{ thread }}</a>
 </li>

misago/templates/misago/thread/post.html

@@ -16,7 +16,7 @@
         {% if post.poster %}
         {% include "misago/user_state.html" with user=post.poster state=post.poster.online_state %}
         <a class="user-name" href="{% url USER_PROFILE_URL user_slug=post.poster.slug user_id=post.poster.id %}">
-          {{ post.poster.username }}</a>
+          {{ post.poster }}</a>
         {% else %}
         <span class="fa fa-power-off fa-fw user-offline tooltip-top" title="{% blocktrans with user=post.poster_name %}{{ user }}'s forum account has been deleted.{% endblocktrans %}"></span>
         <span class="user-name">

misago/templates/misago/thread/replies.html

@@ -2,7 +2,7 @@
 {% load humanize i18n misago_avatars misago_stringutils %}
 
 
-{% block title %}{{ thread.title }}{% if page.number > 1 %} ({% blocktrans with page=page.number %}Page {{ page }}{% endblocktrans %}){% endif %} | {{ block.super }}{% endblock title %}
+{% block title %}{{ thread }}{% if page.number > 1 %} ({% blocktrans with page=page.number %}Page {{ page }}{% endblocktrans %}){% endif %} | {{ block.super }}{% endblock title %}
 
 
 {% block meta-description %}{% if thread.first_post.is_valid %}{{ thread.first_post.short|striplinebreaks }} {% endif %}{% blocktrans trimmed with replies=thread.replies started=thread.started_on|date last_post=thread.last_post_on|date count counter=thread.replies %}
@@ -21,13 +21,13 @@
       <ol class="breadcrumb">
         {% for crumb in path %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
         </li>
         {% endfor %}
       </ol>
       {% endif %}
 
-      <h1>{{ thread.title }}</h1>
+      <h1>{{ thread }}</h1>
 
       <ul class="list-inline page-details">
         <li class="tooltip-bottom" title="{% trans "Thread autor" %}">

misago/templates/misago/threads/base.html

@@ -1,6 +1,7 @@
 {% extends "misago/base.html" %}
 {% load humanize i18n misago_avatars misago_dates misago_shorthands %}
 
+
 {% block content %}
 <div class="container">
   {% block threads-list %}
@@ -29,7 +30,7 @@
               {% endif %}
 
               <a href="{{ thread.get_absolute_url }}" class="item-title">
-                {{ thread.title }}
+                {{ thread }}
               </a>
 
             </div>
@@ -120,7 +121,7 @@
                 {% if thread.label %}
                 <li>
                   <span class="label label-solo label-{{ thread.label.css_class|default:"default" }}">
-                    {{ thread.label.name }}
+                    {{ thread.label }}
                   </span>
                 </li>
                 {% endif %}

misago/templates/misago/threads/forum.html

@@ -2,7 +2,7 @@
 {% load i18n misago_stringutils %}
 
 
-{% block title %}{{ forum.name }}{% if page.number > 1 %} ({% blocktrans with page=page.number %}Page {{ page }}{% endblocktrans %}){% endif %} | {{ block.super }}{% endblock title %}
+{% block title %}{{ forum }}{% if page.number > 1 %} ({% blocktrans with page=page.number %}Page {{ page }}{% endblocktrans %}){% endif %} | {{ block.super }}{% endblock title %}
 
 
 {% block meta-description %}{{ forum.description|striplinebreaks }}{% endblock meta-description %}
@@ -16,13 +16,13 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a>{% if not forloop.last %}<span class="fa fa-chevron-right"></span>{% endif %}
         </li>
         {% endfor %}
       </ol>
       {% endif %}
 
-      <h1>{{ forum.name }}</h1>
+      <h1>{{ forum }}</h1>
     </div>
   </div>
   {{ block.super }}

misago/templates/misago/threads/merge.html

@@ -13,11 +13,11 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a><span class="fa fa-chevron-right"></span>
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a><span class="fa fa-chevron-right"></span>
         </li>
         {% endfor %}
         <li>
-          <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a>
+          <a href="{{ forum.get_absolute_url }}">{{ forum }}</a>
         </li>
       </ol>
       {% endif %}
@@ -41,7 +41,7 @@
 
             <div class="form-header">
               <h2>
-                {% blocktrans trimmed with forum=forum.name %}
+                {% blocktrans trimmed with forum=forum %}
                   Merge threads in {{ forum }}
                 {% endblocktrans %}
               </h2>

misago/templates/misago/threads/merge/full.html

@@ -13,11 +13,11 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a><span class="fa fa-chevron-right"></span>
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a><span class="fa fa-chevron-right"></span>
         </li>
         {% endfor %}
         <li>
-          <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a>
+          <a href="{{ forum.get_absolute_url }}">{{ forum }}</a>
         </li>
       </ol>
       {% endif %}
@@ -41,7 +41,7 @@
 
             <div class="form-header">
               <h2>
-                {% blocktrans trimmed with forum=forum.name %}
+                {% blocktrans trimmed with forum=forum %}
                   Merge threads in {{ forum }}
                 {% endblocktrans %}
               </h2>

misago/templates/misago/threads/move.html

@@ -13,11 +13,11 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a><span class="fa fa-chevron-right"></span>
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a><span class="fa fa-chevron-right"></span>
         </li>
         {% endfor %}
         <li>
-          <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a>
+          <a href="{{ forum.get_absolute_url }}">{{ forum }}</a>
         </li>
       </ol>
       {% endif %}
@@ -41,7 +41,7 @@
 
             <div class="form-header">
               <h2>
-                {% blocktrans trimmed with forum=forum.name %}
+                {% blocktrans trimmed with forum=forum %}
                   Move threads from {{ forum }}
                 {% endblocktrans %}
               </h2>

misago/templates/misago/threads/move/full.html

@@ -13,11 +13,11 @@
       <ol class="breadcrumb">
         {% for crumb in path|slice:":-1" %}
         <li>
-          <a href="{{ crumb.get_absolute_url }}">{{ crumb.name }}</a><span class="fa fa-chevron-right"></span>
+          <a href="{{ crumb.get_absolute_url }}">{{ crumb }}</a><span class="fa fa-chevron-right"></span>
         </li>
         {% endfor %}
         <li>
-          <a href="{{ forum.get_absolute_url }}">{{ forum.name }}</a>
+          <a href="{{ forum.get_absolute_url }}">{{ forum }}</a>
         </li>
       </ol>
       {% endif %}
@@ -41,7 +41,7 @@
 
             <div class="form-header">
               <h2>
-                {% blocktrans trimmed with forum=forum.name %}
+                {% blocktrans trimmed with forum=forum %}
                   Move threads from {{ forum }}
                 {% endblocktrans %}
               </h2>

misago/templates/misago/user_nav.html

@@ -4,7 +4,7 @@
     <a href="{% url USER_PROFILE_URL user_slug=user.slug user_id=user.id %}" class="dropdown-toggle user-toggle" data-toggle="dropdown">
       <span class="glyphicon glyphicon-chevron-down"></span>
       <img src="{{ user|avatar:30 }}" alt="{% trans "Your avatar" %}">
-      {{ user.username }}
+      {{ user }}
     </a>
     <ul class="dropdown-menu">
       <li>

misago/templates/misago/users_cards.html

@@ -9,7 +9,7 @@
       <a href="{% url USER_PROFILE_URL user_slug=card.slug user_id=card.id %}" class="user-card {% if card.rank.css_class %}card-{{ card.rank.css_class }}{% endif %}">
         <img src="{{ card|avatar:400 }}" alt="{% trans "Avatar" %}">
         <div class="card-footer">
-          <h4 class="user-name">{{ card.username }}</h4>
+          <h4 class="user-name">{{ card }}</h4>
         </div>
       </a>
 

misago/templates/misago/userslists/active_posters.html

@@ -36,7 +36,7 @@ List of users that have posted new messages during last {{ days }} days.
           </a>
         </td>
         <td>
-          <a href="{{ user_url }}" class="item-title">{{ ranked.username }}</a>
+          <a href="{{ user_url }}" class="item-title">{{ ranked }}</a>
         </td>
         <td class="lead text-center">
           #{{ forloop.counter }}

misago/templates/misago/userslists/base.html

@@ -45,7 +45,7 @@
               <img src="{{ card|avatar:400 }}" alt="{% trans "Avatar" %}">
               <div class="card-footer">
                 {% block user-card-footer %}
-                <h4 class="user-name">{{ card.username }}</h4>
+                <h4 class="user-name">{{ card }}</h4>
                 {% endblock user-card-footer %}
               </div>
             </a>

misago/templates/misago/userslists/online.html

@@ -9,7 +9,7 @@
 <a href="{% url USER_PROFILE_URL user_slug=card.user.slug user_id=card.user.id %}" class="user-card {% if card.user.rank.css_class %}card-{{ card.user.rank.css_class }}{% endif %}">
   <img src="{{ card.user|avatar:400 }}" alt="{% trans "Avatar" %}">
   <div class="card-footer">
-    <h4 class="user-name">{{ card.user.username }}</h4>
+    <h4 class="user-name">{{ card.user }}</h4>
     <small>
       <abbr class="tooltip-top dynamic time-ago" title="{% blocktrans with last_click=card.last_click|date:"TIME_FORMAT" %}Last click on {{ last_click }}{% endblocktrans %}" data-timestamp="{{ card.last_click|date:"c" }}">
         {{ card.last_click|date }}
@@ -53,7 +53,7 @@
           </a>
         </td>
         <td>
-          <a href="{{ user_url }}" class="item-title">{{ online.user.username }}</a>
+          <a href="{{ user_url }}" class="item-title">{{ online.user }}</a>
         </td>
         <td>
           <abbr class="tooltip-top dynamic time-ago" title="{% blocktrans with last_click=online.last_click|date:"TIME_FORMAT" %}Last click on {{ last_click }}{% endblocktrans %}" data-timestamp="{{ online.last_click|date:"c" }}">

misago/templates/misago/userslists/rank.html

@@ -70,7 +70,7 @@ There are {{ users }} users with {{ rank }} rank.
   <img src="{{ card|avatar:400 }}" alt="{% trans "Avatar" %}">
   <div class="card-footer">
     {% block user-card-footer %}
-    <h4 class="user-name">{{ card.username }}</h4>
+    <h4 class="user-name">{{ card }}</h4>
     {% if card.title %}
     <small>{{ card.title }}</small>
     {% elif rank.title %}

misago/threads/views/generic/thread/threadactions.py

@@ -1,4 +1,5 @@
 from django.contrib import messages
+from django.db.transaction import atomic
 from django.shortcuts import redirect, render
 from django.utils.translation import ugettext as _
 
@@ -187,7 +188,10 @@ class ThreadActions(ActionsBase):
         messages.success(request, _("Thread was hid."))
 
     def action_delete(self, request, thread):
-        moderation.delete_thread(request.user, thread)
+        with atomic():
+            moderation.delete_thread(request.user, thread)
+            self.forum.synchronize()
+            self.forum.save()
 
         message = _('Thread "%(thread)s" was deleted.')
         messages.success(request, message % {'thread': thread.title})

misago/users/models/warnings.py

@@ -67,6 +67,9 @@ class WarningLevel(models.Model):
 
     objects = WarningLevelManager()
 
+    def __unicode__(self):
+        return self.name
+
     def save(self, *args, **kwargs):
         if not self.pk:
             self.set_level()