#398: changed username with user

misago/templates/misago/acl_debug.html

@@ -2,8 +2,8 @@
 
 <h4>
 {% if misago_user.is_authenticated %}
-  {% blocktrans with username=misago_user.username %}
-  {{ username }} roles
+  {% blocktrans with user=misago_user.username %}
+  {{ user }} roles
   {% endblocktrans %}
 {% else %}
   {% trans "Anonymous roles" %}

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

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

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

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

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

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

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

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

misago/templates/misago/emails/change_email_password.html

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

misago/templates/misago/emails/change_email_password.txt

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

misago/templates/misago/emails/change_password_form_link.html

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

misago/templates/misago/emails/change_password_form_link.txt

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

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

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

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

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

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

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

misago/templates/misago/forgottenpassword/reset_password_form.html

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

misago/templates/misago/modusers/ban.html

@@ -22,8 +22,8 @@
 
         <div class="form-header">
           <h2>
-            {% blocktrans trimmed with username=profile.username %}
-            Ban {{ username }}
+            {% blocktrans trimmed with user=profile.username %}
+            Ban {{ user }}
             {% endblocktrans %}
           </h2>
         </div>

misago/templates/misago/modusers/rename.html

@@ -22,8 +22,8 @@
 
         <div class="form-header">
           <h2>
-            {% blocktrans trimmed with username=profile.username %}
-            Rename {{ username }}
+            {% blocktrans trimmed with user=profile.username %}
+            Rename {{ user }}
             {% endblocktrans %}
           </h2>
         </div>

misago/templates/misago/modusers/signature.html

@@ -31,8 +31,8 @@
         <div class="form-body form-markup-preview">
           {% if not profile.signature %}
           <p class="lead">
-            {% blocktrans trimmed with username=profile.username %}
-            {{ username }} has no signature set.
+            {% blocktrans trimmed with user=profile.username %}
+            {{ user }} has no signature set.
             {% endblocktrans %}
           </p>
           {% elif profile.has_valid_signature %}

misago/templates/misago/profile/ban_details.html

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

misago/templates/misago/register/completed.html

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

misago/users/forms/auth.py

@@ -38,21 +38,21 @@ class MisagoAuthMixin(object):
         if self.user_ban:
             if self.user_ban.valid_until:
                 if self.user_ban.user_message:
-                    message = _("%(username)s, your account is "
+                    message = _("%(user)s, your account is "
                                 "banned until %(date)s for:")
                 else:
-                    message = _("%(username)s, your account "
+                    message = _("%(user)s, your account "
                                 "is banned until %(date)s.")
                 date_format = {'date': format_date(self.user_ban.valid_until)}
                 message = message % date_format
             else:
                 if self.user_ban.user_message:
-                    message = _("%(username)s, your account is banned for:")
+                    message = _("%(user)s, your account is banned for:")
                 else:
-                    message = _("%(username)s, your account is banned.")
+                    message = _("%(user)s, your account is banned.")
 
             raise ValidationError(
-                message % {'username': self.user_cache.username},
+                message % {'user': self.user_cache.username},
                 code='banned',
             )
 
@@ -143,14 +143,14 @@ class ResendActivationForm(GetUserForm):
     def confirm_allowed(self, user):
         self.confirm_user_not_banned(user)
 
-        username_format = {'username': user.username}
+        username_format = {'user': user.username}
 
         if not user.requires_activation:
-            message = _("%(username)s, your account is already active.")
+            message = _("%(user)s, your account is already active.")
             raise forms.ValidationError(message % username_format)
 
         if user.requires_activation_by_admin:
-            message = _("%(username)s, only administrator may activate "
+            message = _("%(user)s, only administrator may activate "
                         "your account.")
             raise forms.ValidationError(message % username_format)
 

misago/users/permissions/warnings.py

@@ -39,7 +39,7 @@ def change_permissions_form(role):
     if isinstance(role, Role) and role.special_role != 'anonymous':
         return PermissionsForm
     else:
-        return None
+        return Nonef
 
 
 """
@@ -116,8 +116,8 @@ def allow_warn_user(user, target):
     if not user.is_superuser and (target.is_staff or target.is_superuser):
         raise PermissionDenied(_("You can't warn administrators."))
     if not target.acl['can_be_warned']:
-        message = _("%(username)s can't be warned.")
-        raise PermissionDenied(message % {'username': target.username})
+        message = _("%(user)s can't be warned.")
+        raise PermissionDenied(message % {'user': target.username})
 can_warn_user = return_boolean(allow_warn_user)
 
 

misago/users/views/activation.py

@@ -77,23 +77,23 @@ def activate_by_token(request, user_id, token):
 
     try:
         if not inactive_user.requires_activation:
-            message = _("%(username)s, your account is already active.")
-            message = message % {'username': inactive_user.username}
+            message = _("%(user)s, your account is already active.")
+            message = message % {'user': inactive_user.username}
             raise ActivationStopped(message)
         if inactive_user.requires_activation_by_admin:
-            message = _("%(username)s, your account can be activated "
+            message = _("%(user)s, your account can be activated "
                         "only by one of the administrators.")
-            message = message % {'username': inactive_user.username}
+            message = message % {'user': inactive_user.username}
             raise ActivationStopped(message)
         if get_user_ban(inactive_user):
-            message = _("%(username)s, your account is banned "
+            message = _("%(user)s, your account is banned "
                         "and can't be activated.")
-            message = message % {'username': inactive_user.username}
+            message = message % {'user': inactive_user.username}
             raise ActivationError(message)
         if not is_activation_token_valid(inactive_user, token):
-            message = _("%(username)s, your activation link is invalid. "
+            message = _("%(user)s, your activation link is invalid. "
                         "Try again or request new activation message.")
-            message = message % {'username': inactive_user.username}
+            message = message % {'user': inactive_user.username}
             raise ActivationError(message)
     except ActivationStopped as e:
         messages.info(request, e.args[0])
@@ -105,8 +105,8 @@ def activate_by_token(request, user_id, token):
     inactive_user.requires_activation = ACTIVATION_REQUIRED_NONE
     inactive_user.save(update_fields=['requires_activation'])
 
-    message = _("%(username)s, your account has been activated!")
-    message = message % {'username': inactive_user.username}
+    message = _("%(user)s, your account has been activated!")
+    message = message % {'user': inactive_user.username}
     messages.success(request, message)
 
     return redirect(settings.LOGIN_URL)

misago/users/views/admin/users.py

@@ -110,8 +110,8 @@ class UsersList(UserAdmin, generic.ListView):
         users = users.order_by('slug')
         for user in users:
             if user.is_superuser:
-                message = _("%(username)s is super admin and can't be banned.")
-                mesage = message % {'username': user.username}
+                message = _("%(user)s is super admin and can't be banned.")
+                mesage = message % {'user': user.username}
                 raise generic.MassActionError(mesage)
 
         form = BanUsersForm()
@@ -141,8 +141,8 @@ class UsersList(UserAdmin, generic.ListView):
         inactive_users = []
         for user in users:
             if user.is_staff or user.is_superuser:
-                message = _("%(username)s is admin and can't be deleted.")
-                mesage = message % {'username': user.username}
+                message = _("%(user)s is admin and can't be deleted.")
+                mesage = message % {'user': user.username}
                 raise generic.MassActionError(mesage)
 
         for user in users:
@@ -155,8 +155,8 @@ class UsersList(UserAdmin, generic.ListView):
         inactive_users = []
         for user in users:
             if user.is_staff or user.is_superuser:
-                message = _("%(username)s is admin and can't be deleted.")
-                mesage = message % {'username': user.username}
+                message = _("%(user)s is admin and can't be deleted.")
+                mesage = message % {'user': user.username}
                 raise generic.MassActionError(mesage)
 
         for user in users:

misago/users/views/auth.py

@@ -24,10 +24,10 @@ def login(request):
         form = AuthenticationForm(request, data=request.POST)
         if form.is_valid():
 
-            message = _("Welcome back, %(username)s! You have been "
+            message = _("Welcome back, %(user)s! You have been "
                         "signed in successfully.")
             messages.success(
-                request, message % {'username': form.user_cache.username})
+                request, message % {'user': form.user_cache.username})
             auth.login(request, form.user_cache)
             return redirect(settings.LOGIN_REDIRECT_URL)
 
@@ -39,8 +39,8 @@ def login(request):
 @csrf_protect
 @never_cache
 def logout(request):
-    message = _("%(username)s, you have been signed out.")
+    message = _("%(user)s, you have been signed out.")
     messages.info(
-        request, message % {'username': request.user.username})
+        request, message % {'user': request.user.username})
     auth.logout(request)
     return redirect('misago:index')

misago/users/views/forgottenpassword.py

@@ -35,9 +35,9 @@ def request_reset(request):
             requesting_user = form.user_cache
             request.session['reset_password_link_sent_to'] = requesting_user.pk
 
-            mail_subject = _("Change %(username)s password "
+            mail_subject = _("Change %(user)s password "
                              "on %(forum_title)s forums")
-            subject_formats = {'username': requesting_user.username,
+            subject_formats = {'user': requesting_user.username,
                                'forum_title': settings.forum_name}
             mail_subject = mail_subject % subject_formats
 
@@ -82,25 +82,25 @@ def reset_password_form(request, user_id, token):
 
     try:
         if requesting_user.requires_activation_by_admin:
-            message = _("%(username)s, administrator has to activate your "
+            message = _("%(user)s, administrator has to activate your "
                         "account before you will be able to request "
                         "new password.")
-            message = message % {'username': requesting_user.username}
+            message = message % {'user': requesting_user.username}
             raise ResetStopped(message)
         if requesting_user.requires_activation_by_user:
-            message = _("%(username)s, you have to activate your account "
+            message = _("%(user)s, you have to activate your account "
                         "before you will be able to request new password.")
-            message = message % {'username': requesting_user.username}
+            message = message % {'user': requesting_user.username}
             raise ResetStopped(message)
         if get_user_ban(requesting_user):
-            message = _("%(username)s, your account is banned "
+            message = _("%(user)s, your account is banned "
                         "and it's password can't be changed.")
-            message = message % {'username': requesting_user.username}
+            message = message % {'user': requesting_user.username}
             raise ResetError(message)
         if not is_password_reset_token_valid(requesting_user, token):
-            message = _("%(username)s, your link is invalid. "
+            message = _("%(user)s, your link is invalid. "
                         "Try again or request new link.")
-            message = message % {'username': requesting_user.username}
+            message = message % {'user': requesting_user.username}
             raise ResetError(message)
     except ResetStopped as e:
         messages.info(request, e.args[0])
@@ -116,8 +116,8 @@ def reset_password_form(request, user_id, token):
             requesting_user.set_password(form.cleaned_data['new_password'])
             requesting_user.save(update_fields=['password'])
 
-            message = _("%(username)s, your password has been changed.")
-            message = message % {'username': requesting_user.username}
+            message = _("%(user)s, your password has been changed.")
+            message = message % {'user': requesting_user.username}
             messages.success(request, message)
             return redirect(settings.LOGIN_URL)
 

misago/users/views/moderation.py

@@ -66,9 +66,9 @@ def warn(request, user, reason=None):
     return_path = moderation_return_path(request, user)
 
     if warnings.is_user_warning_level_max(user):
-        message = _("%(username)s has maximum warning "
+        message = _("%(user)s has maximum warning "
                     "level and can't be warned.")
-        message = message % {'username': user.username}
+        message = message % {'user': user.username}
         messages.info(request, message)
 
         return redirect(return_path)
@@ -79,8 +79,8 @@ def warn(request, user, reason=None):
         if form.is_valid():
             warnings.warn_user(request.user, user, form.cleaned_data['reason'])
 
-            message = _("%(username)s has been warned.")
-            message = message % {'username': user.username}
+            message = _("%(user)s has been warned.")
+            message = message % {'user': user.username}
             messages.success(request, message)
 
             return redirect(return_path)
@@ -127,8 +127,8 @@ def warning_moderation_view(required_permission=None):
 def cancel_warning(request, user, warning):
     warnings.cancel_warning(request.user, user, warning)
 
-    message = _("%(username)s's warning has been canceled.")
-    message = message % {'username': user.username}
+    message = _("%(user)s's warning has been canceled.")
+    message = message % {'user': user.username}
     messages.success(request, message)
 
 
@@ -137,8 +137,8 @@ def cancel_warning(request, user, warning):
 def delete_warning(request, user, warning):
     warnings.delete_warning(request.user, user, warning)
 
-    message = _("%(username)s's warning has been deleted.")
-    message = message % {'username': user.username}
+    message = _("%(user)s's warning has been deleted.")
+    message = message % {'user': user.username}
     messages.success(request, message)
 
 
@@ -182,8 +182,8 @@ def moderate_avatar(request, user):
                 'avatar_lock_staff_message'
             ))
 
-            message = _("%(username)s's avatar has been moderated.")
-            message = message % {'username': user.username}
+            message = _("%(user)s's avatar has been moderated.")
+            message = message % {'user': user.username}
             messages.success(request, message)
 
             if 'stay' not in request.POST:
@@ -211,8 +211,8 @@ def moderate_signature(request, user):
                 'signature_lock_staff_message'
             ))
 
-            message = _("%(username)s's signature has been moderated.")
-            message = message % {'username': user.username}
+            message = _("%(user)s's signature has been moderated.")
+            message = message % {'user': user.username}
             messages.success(request, message)
 
             if 'stay' not in request.POST:
@@ -237,8 +237,8 @@ def ban_user(request, user):
         if form.is_valid():
             form.ban_user()
 
-            message = _("%(username)s has been banned.")
-            messages.success(request, message % {'username': user.username})
+            message = _("%(user)s has been banned.")
+            messages.success(request, message % {'user': user.username})
 
             return redirect(user_profile.get_default_link(),
                             user_slug=user.slug, user_id=user.pk)
@@ -256,8 +256,8 @@ def lift_user_ban(request, user):
 
     Ban.objects.invalidate_cache()
 
-    message = _("%(username)s's ban has been lifted.")
-    messages.success(request, message % {'username': user.username})
+    message = _("%(user)s's ban has been lifted.")
+    messages.success(request, message % {'user': user.username})
 
     return redirect(user_profile.get_default_link(),
                     user_slug=user.slug, user_id=user.pk)
@@ -268,6 +268,6 @@ def lift_user_ban(request, user):
 def delete(request, user):
     user.delete(delete_content=True)
 
-    message = _("User %(username)s has been deleted.")
-    messages.success(request, message % {'username': user.username})
+    message = _("User %(user)s has been deleted.")
+    messages.success(request, message % {'user': user.username})
     return redirect('misago:index')

misago/users/views/register.py

@@ -64,8 +64,8 @@ def register(request):
                     password=form.cleaned_data['password'])
                 login(request, authenticated_user)
 
-                welcome_message = _("Welcome aboard, %(username)s!")
-                welcome_message = welcome_message % {'username': new_user.username}
+                welcome_message = _("Welcome aboard, %(user)s!")
+                welcome_message = welcome_message % {'user': new_user.username}
                 messages.success(request, welcome_message)
 
                 mail_user(request, new_user, mail_subject,

misago/users/views/usercp.py

@@ -297,9 +297,9 @@ def change_email_password(request):
             credentials_token = cache_new_credentials(
                 request.user, new_email, new_password)
 
-            mail_subject = _("Confirm changes to %(username)s account "
+            mail_subject = _("Confirm changes to %(user)s account "
                              "on %(forum_title)s forums")
-            subject_formats = {'username': request.user.username,
+            subject_formats = {'user': request.user.username,
                                'forum_title': settings.forum_name}
             mail_subject = mail_subject % subject_formats