fix #438

misago/acl/views.py

@@ -43,7 +43,8 @@ class RoleFormMixin(object):
                 form.instance.permissions = new_permissions
                 form.instance.save()
 
-                messages.success(request, self.message_submit % target.name)
+                messages.success(
+                    request, self.message_submit % {'name': target.name})
 
                 if 'stay' in request.POST:
                     return redirect(request.path)
@@ -62,23 +63,24 @@ class RoleFormMixin(object):
 
 
 class NewRole(RoleFormMixin, RoleAdmin, generic.ModelFormView):
-    message_submit = _('New role "%s" has been saved.')
+    message_submit = _('New role "%(name)s" has been saved.')
 
 
 class EditRole(RoleFormMixin, RoleAdmin, generic.ModelFormView):
-    message_submit = _('Role "%s" has been changed.')
+    message_submit = _('Role "%(name)s" has been changed.')
 
 
 class DeleteRole(RoleAdmin, generic.ButtonView):
     def check_permissions(self, request, target):
         if target.special_role:
-            message = _('Role "%s" is special role and can\'t be deleted.')
-            return message % target.name
+            message = _('Role "%(name)s" is special role '
+                        'and can\'t be deleted.')
+            return message % {'name': target.name}
 
     def button_action(self, request, target):
         target.delete()
-        message = _('Role "%s" has been deleted.') % unicode(target.name)
-        messages.success(request, message)
+        message = _('Role "%(name)s" has been deleted.')
+        messages.success(request, message % {'name': target.name})
 
 
 class RoleUsers(RoleAdmin, generic.TargetedView):

misago/admin/views/generic/formsbuttons.py

@@ -100,7 +100,8 @@ class ModelFormView(FormView):
     def handle_form(self, form, request, target):
         form.instance.save()
         if self.message_submit:
-            messages.success(request, self.message_submit % target.name)
+            format = {'name': target.name}
+            messages.success(request, self.message_submit % format)
 
     def real_dispatch(self, request, target):
         FormType = self.create_form_type(request, target)

misago/conf/views.py

@@ -47,8 +47,8 @@ def group(request, group_key):
 
             db_settings.flush_cache()
 
-            messages.success(request,
-                             _('Changes in settings have been saved!'))
+            messages.success(
+                request, _('Changes in settings have been saved!'))
             return redirect('misago:admin:settings:group', group_key=group_key)
 
     use_single_form_template = (len(fieldsets) == 1 and

misago/forums/views/forumsadmin.py

@@ -82,19 +82,19 @@ class ForumFormMixin(object):
                 RoleForumACL.objects.bulk_create(copied_acls)
 
         acl_version.invalidate()
-        messages.success(request, self.message_submit % target.name)
+        messages.success(request, self.message_submit % {'name': target.name})
 
 
 class NewForum(ForumFormMixin, ForumAdmin, generic.ModelFormView):
-    message_submit = _('New forum "%s" has been saved.')
+    message_submit = _('New forum "%(name)s" has been saved.')
 
 
 class EditForum(ForumFormMixin, ForumAdmin, generic.ModelFormView):
-    message_submit = _('Forum "%s" has been edited.')
+    message_submit = _('Forum "%(name)s" has been edited.')
 
 
 class DeleteForum(ForumAdmin, generic.ModelFormView):
-    message_submit = _('Forum "%s" has been deleted.')
+    message_submit = _('Forum "%(name)s" has been deleted.')
     template = 'delete.html'
 
     def create_form_type(self, request, target):
@@ -123,7 +123,7 @@ class DeleteForum(ForumAdmin, generic.ModelFormView):
 
         form.instance.delete()
 
-        messages.success(request, self.message_submit % target.name)
+        messages.success(request, self.message_submit % {'name': target.name})
         return redirect(self.root_link)
 
 
@@ -138,8 +138,8 @@ class MoveDownForum(ForumAdmin, generic.ButtonView):
             Forum.objects.move_node(target, other_target, 'right')
             Forum.objects.clear_cache()
 
-            message = _('Forum "%s" has been moved below "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Forum "%(name)s" has been moved below "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)
 
 
@@ -154,6 +154,6 @@ class MoveUpForum(ForumAdmin, generic.ButtonView):
             Forum.objects.move_node(target, other_target, 'left')
             Forum.objects.clear_cache()
 
-            message = _('Forum "%s" has been moved above "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Forum "%(name)s" has been moved above "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)

misago/forums/views/permsadmin.py

@@ -48,7 +48,8 @@ class RoleFormMixin(object):
                 form.instance.permissions = new_permissions
                 form.instance.save()
 
-                messages.success(request, self.message_submit % target.name)
+                messages.success(
+                    request, self.message_submit % {'name': target.name})
 
                 if 'stay' in request.POST:
                     return redirect(request.path)
@@ -67,23 +68,24 @@ class RoleFormMixin(object):
 
 
 class NewForumRole(RoleFormMixin, ForumRoleAdmin, generic.ModelFormView):
-    message_submit = _('New role "%s" has been saved.')
+    message_submit = _('New role "%(name)s" has been saved.')
 
 
 class EditForumRole(RoleFormMixin, ForumRoleAdmin, generic.ModelFormView):
-    message_submit = _('Role "%s" has been changed.')
+    message_submit = _('Role "%(name)s" has been changed.')
 
 
 class DeleteForumRole(ForumRoleAdmin, generic.ButtonView):
     def check_permissions(self, request, target):
         if target.special_role:
-            message = _('Role "%s" is special role and can\'t be deleted.')
-            return message % target.name
+            message = _('Role "%(name)s" is special '
+                        'role and can\'t be deleted.')
+            return message % {'name': target.name}
 
     def button_action(self, request, target):
         target.delete()
-        message = _('Role "%s" has been deleted.') % unicode(target.name)
-        messages.success(request, message)
+        message = _('Role "%(name)s" has been deleted.')
+        messages.success(request, message % {'name': target.name})
 
 
 """
@@ -131,8 +133,8 @@ class ForumPermissions(ForumAdmin, generic.ModelFormView):
 
             acl_version.invalidate()
 
-            message = _("Forum %s permissions have been changed.")
-            messages.success(request, message % target)
+            message = _("Forum %(name)s permissions have been changed.")
+            messages.success(request, message % {'name': target.name})
             if 'stay' in request.POST:
                 return redirect(request.path)
             else:
@@ -145,7 +147,6 @@ class ForumPermissions(ForumAdmin, generic.ModelFormView):
                 'target': target,
             })
 
-
 ForumsList.add_item_action(
     name=_("Forum permissions"),
     icon='fa fa-adjust',
@@ -202,8 +203,9 @@ class RoleForumsACL(RoleAdmin, generic.ModelFormView):
 
             acl_version.invalidate()
 
-            message = _("Forum permissions for role %s have been changed.")
-            messages.success(request, message % target)
+            message = _("Forum permissions for role "
+                        "%(name)s have been changed.")
+            messages.success(request, message % {'name': target.name})
             if 'stay' in request.POST:
                 return redirect(request.path)
             else:
@@ -215,6 +217,7 @@ class RoleForumsACL(RoleAdmin, generic.ModelFormView):
                 'forms': forms,
                 'target': target,
             })
+
 RolesList.add_item_action(
     name=_("Forums permissions"),
     icon='fa fa-comments-o',

misago/locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-12 14:37+0000\n"
+"POT-Creation-Date: 2014-10-15 16:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -80,28 +80,28 @@ msgstr ""
 msgid "Requested role does not exist."
 msgstr ""
 
-#: acl/views.py:53 forums/views/permsadmin.py:58
+#: acl/views.py:54 forums/views/permsadmin.py:59
 msgid "Form contains errors."
 msgstr ""
 
-#: acl/views.py:65 forums/views/permsadmin.py:70
+#: acl/views.py:66 forums/views/permsadmin.py:71
 #, python-format
-msgid "New role \"%s\" has been saved."
+msgid "New role \"%(name)s\" has been saved."
 msgstr ""
 
-#: acl/views.py:69 forums/views/permsadmin.py:74
+#: acl/views.py:70 forums/views/permsadmin.py:75
 #, python-format
-msgid "Role \"%s\" has been changed."
+msgid "Role \"%(name)s\" has been changed."
 msgstr ""
 
-#: acl/views.py:75 forums/views/permsadmin.py:80
+#: acl/views.py:76 forums/views/permsadmin.py:81
 #, python-format
-msgid "Role \"%s\" is special role and can't be deleted."
+msgid "Role \"%(name)s\" is special role and can't be deleted."
 msgstr ""
 
-#: acl/views.py:80 forums/views/permsadmin.py:85
+#: acl/views.py:82 forums/views/permsadmin.py:87
 #, python-format
-msgid "Role \"%s\" has been deleted."
+msgid "Role \"%(name)s\" has been deleted."
 msgstr ""
 
 #: admin/admin.py:10 templates/misago/admin/index.html:5
@@ -970,48 +970,48 @@ msgstr ""
 
 #: forums/views/forumsadmin.py:89
 #, python-format
-msgid "New forum \"%s\" has been saved."
+msgid "New forum \"%(name)s\" has been saved."
 msgstr ""
 
 #: forums/views/forumsadmin.py:93
 #, python-format
-msgid "Forum \"%s\" has been edited."
+msgid "Forum \"%(name)s\" has been edited."
 msgstr ""
 
 #: forums/views/forumsadmin.py:97
 #, python-format
-msgid "Forum \"%s\" has been deleted."
+msgid "Forum \"%(name)s\" has been deleted."
 msgstr ""
 
 #: forums/views/forumsadmin.py:141
 #, python-format
-msgid "Forum \"%s\" has been moved below \"%s\"."
+msgid "Forum \"%(name)s\" has been moved below \"%(other)s\"."
 msgstr ""
 
 #: forums/views/forumsadmin.py:157
 #, python-format
-msgid "Forum \"%s\" has been moved above \"%s\"."
+msgid "Forum \"%(name)s\" has been moved above \"%(other)s\"."
 msgstr ""
 
-#: forums/views/permsadmin.py:134
+#: forums/views/permsadmin.py:136
 #, python-format
-msgid "Forum %s permissions have been changed."
+msgid "Forum %(name)s permissions have been changed."
 msgstr ""
 
-#: forums/views/permsadmin.py:150
+#: forums/views/permsadmin.py:151
 msgid "Forum permissions"
 msgstr ""
 
-#: forums/views/permsadmin.py:169 templates/misago/admin/forums/list.html:87
+#: forums/views/permsadmin.py:170 templates/misago/admin/forums/list.html:87
 msgid "No forums exist."
 msgstr ""
 
-#: forums/views/permsadmin.py:205
+#: forums/views/permsadmin.py:206
 #, python-format
-msgid "Forum permissions for role %s have been changed."
+msgid "Forum permissions for role %(name)s have been changed."
 msgstr ""
 
-#: forums/views/permsadmin.py:219
+#: forums/views/permsadmin.py:222
 msgid "Forums permissions"
 msgstr ""
 
@@ -1103,7 +1103,7 @@ msgid_plural "You have %(notifications)s new notifications"
 msgstr[0] ""
 msgstr[1] ""
 
-#: notifications/views.py:123 templates/misago/user_nav.html:88
+#: notifications/views.py:123 templates/misago/user_nav.html:82
 msgid "Your notifications"
 msgstr ""
 
@@ -1793,7 +1793,7 @@ msgstr ""
 #: templates/misago/ranks_online.html:14
 #: templates/misago/thread/events.html:15
 #: templates/misago/thread/replies.html:36
-#: templates/misago/threads/base.html:50 templates/misago/threads/base.html:54
+#: templates/misago/threads/base.html:52 templates/misago/threads/base.html:56
 #: templates/misago/users_cards.html:10
 #: templates/misago/userslists/active_posters.html:35
 #: templates/misago/userslists/base.html:45
@@ -1903,7 +1903,7 @@ msgstr ""
 
 #: templates/misago/admin/warnings/list.html:44
 #: templates/misago/admin/warnings/list.html:62
-#: templates/misago/threads/base.html:97
+#: templates/misago/threads/base.html:106
 msgid "Moderated"
 msgstr ""
 
@@ -1940,12 +1940,12 @@ msgstr ""
 msgid "Request has timed out."
 msgstr ""
 
-#: templates/misago/base.html:53
+#: templates/misago/base.html:52
 msgid "Unspecified error occured."
 msgstr ""
 
-#: templates/misago/base.html:54 templates/misago/base.html.py:55
-#: templates/misago/base.html:56 templates/misago/messages.html:20
+#: templates/misago/base.html:53 templates/misago/base.html.py:54
+#: templates/misago/base.html:55 templates/misago/messages.html:20
 #: templates/misago/register/form.html:79
 #: templates/misago/register/form.html:112
 msgid "Ok!"
@@ -2443,7 +2443,7 @@ msgid "Advanced search"
 msgstr ""
 
 #: templates/misago/notifications/dropdown.html:7
-#: templates/misago/user_nav.html:86
+#: templates/misago/user_nav.html:80
 #, python-format
 msgid "%(notifications)s new notification"
 msgid_plural "%(notifications)s new notifications"
@@ -2922,7 +2922,7 @@ msgid "Thread autor"
 msgstr ""
 
 #: templates/misago/thread/replies.html:43
-#: templates/misago/threads/base.html:60
+#: templates/misago/threads/base.html:62
 #, python-format
 msgid "%(replies)s reply"
 msgid_plural "%(replies)s replies"
@@ -2930,7 +2930,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: templates/misago/thread/replies.html:49
-#: templates/misago/threads/base.html:45
+#: templates/misago/threads/base.html:47
 #, python-format
 msgid "Last post from %(last_post)s"
 msgstr ""
@@ -2956,61 +2956,66 @@ msgstr ""
 msgid "Thread has unread posts"
 msgstr ""
 
-#: templates/misago/threads/base.html:49 templates/misago/threads/base.html:53
+#: templates/misago/threads/base.html:51 templates/misago/threads/base.html:55
 #, python-format
 msgid "Last post by %(user)s"
 msgstr ""
 
-#: templates/misago/threads/base.html:66
+#: templates/misago/threads/base.html:68
 #, python-format
 msgid "New thread with %(replies)s reply"
 msgid_plural "New thread with %(replies)s replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/misago/threads/base.html:73
+#: templates/misago/threads/base.html:75
 #, python-format
 msgid "%(replies)s new reply"
 msgid_plural "%(replies)s new replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/misago/threads/base.html:82
+#: templates/misago/threads/base.html:83
+msgid "Thread location"
+msgstr ""
+
+#: templates/misago/threads/base.html:91
 msgid "Reported posts"
 msgstr ""
 
-#: templates/misago/threads/base.html:87 templates/misago/user_nav.html:72
+#: templates/misago/threads/base.html:96 templates/misago/user_nav.html:66
 msgid "Moderated posts"
 msgstr ""
 
-#: templates/misago/threads/base.html:92
+#: templates/misago/threads/base.html:101
 msgid "Poll"
 msgstr ""
 
-#: templates/misago/threads/base.html:102
+#: templates/misago/threads/base.html:111
 msgid "Closed"
 msgstr ""
 
-#: templates/misago/threads/base.html:107
+#: templates/misago/threads/base.html:116
 #: templates/misago/userslists/online.html:42
 msgid "Hidden"
 msgstr ""
 
-#: templates/misago/threads/forum.html:5
+#: templates/misago/threads/forum.html:5 templates/misago/threads/new.html:5
+#: templates/misago/threads/unread.html:5
 #, python-format
 msgid "Page %(page)s"
 msgstr ""
 
-#: templates/misago/threads/forum.html:74
+#: templates/misago/threads/forum.html:75
 msgid ""
 "No threads matching criteria exist, or you don't have permission to see them."
 msgstr ""
 
-#: templates/misago/threads/forum.html:76
+#: templates/misago/threads/forum.html:77
 msgid "See all threads"
 msgstr ""
 
-#: templates/misago/threads/forum.html:79
+#: templates/misago/threads/forum.html:80
 msgid ""
 "No threads were posted in this forum, or you don't have permission to see "
 "them."
@@ -3063,6 +3068,23 @@ msgstr ""
 msgid "Threads that will be moved:"
 msgstr ""
 
+#: templates/misago/threads/new.html:5 templates/misago/user_nav.html:34
+msgid "New threads"
+msgstr ""
+
+#: templates/misago/threads/new.html:12
+msgid "Threads you have never read"
+msgstr ""
+
+#: templates/misago/threads/new.html:36
+#, python-format
+msgid "There are no threads from last %(days)s day that you have never read."
+msgid_plural ""
+"There are no threads from last %(days)s days that you have you have never "
+"read."
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/misago/threads/reply_btn.html:5
 msgid "This forum is closed."
 msgstr ""
@@ -3087,6 +3109,22 @@ msgstr ""
 msgid "Show threads:"
 msgstr ""
 
+#: templates/misago/threads/unread.html:5 templates/misago/user_nav.html:41
+msgid "Unread threads"
+msgstr ""
+
+#: templates/misago/threads/unread.html:12
+msgid "Threads with unread replies"
+msgstr ""
+
+#: templates/misago/threads/unread.html:36
+#, python-format
+msgid "There are no threads with unread replies from last %(days)s day."
+msgid_plural ""
+"There are no threads with unread replies from last %(days)s days."
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/misago/user_nav.html:13
 msgid "See your profile"
 msgstr ""
@@ -3096,31 +3134,23 @@ msgstr ""
 msgid "Change options"
 msgstr ""
 
-#: templates/misago/user_nav.html:28
+#: templates/misago/user_nav.html:26
 msgid "See all notifications"
 msgstr ""
 
-#: templates/misago/user_nav.html:44
+#: templates/misago/user_nav.html:50
 msgid "Sign out"
 msgstr ""
 
-#: templates/misago/user_nav.html:54
-msgid "New threads"
-msgstr ""
-
 #: templates/misago/user_nav.html:60
-msgid "Unread threads"
-msgstr ""
-
-#: templates/misago/user_nav.html:66
 msgid "Unresolved reports"
 msgstr ""
 
-#: templates/misago/user_nav.html:78
+#: templates/misago/user_nav.html:72
 msgid "Private threads"
 msgstr ""
 
-#: templates/misago/user_nav.html:102
+#: templates/misago/user_nav.html:94
 msgid "Loading..."
 msgstr ""
 
@@ -3506,27 +3536,27 @@ msgstr ""
 msgid "%(user)s merged in %(thread)s."
 msgstr ""
 
-#: threads/moderation/threads.py:103
+#: threads/moderation/threads.py:101
 #, python-format
 msgid "%(user)s approved thread."
 msgstr ""
 
-#: threads/moderation/threads.py:119
+#: threads/moderation/threads.py:117
 #, python-format
 msgid "%(user)s opened thread."
 msgstr ""
 
-#: threads/moderation/threads.py:132
+#: threads/moderation/threads.py:130
 #, python-format
 msgid "%(user)s closed thread."
 msgstr ""
 
-#: threads/moderation/threads.py:145
+#: threads/moderation/threads.py:143
 #, python-format
 msgid "%(user)s made thread visible."
 msgstr ""
 
-#: threads/moderation/threads.py:162
+#: threads/moderation/threads.py:160
 #, python-format
 msgid "%(user)s hid thread."
 msgstr ""
@@ -3789,6 +3819,15 @@ msgstr ""
 msgid "With moderated posts"
 msgstr ""
 
+#: threads/tests/test_newthreads_views.py:57 threads/views/newthreads.py:47
+msgid "You have to sign in to see your list of new threads."
+msgstr ""
+
+#: threads/tests/test_unreadthreads_view.py:46
+#: threads/views/unreadthreads.py:48
+msgid "You have to sign in to see your list of threads with unread replies."
+msgstr ""
+
 #: threads/validators.py:12
 msgid "Enter thread title."
 msgstr ""
@@ -3870,65 +3909,65 @@ msgstr[1] ""
 msgid "You have to select at least two threads to merge."
 msgstr ""
 
-#: threads/views/generic/forum/actions.py:264
+#: threads/views/generic/forum/actions.py:266
 #, python-format
 msgid "%(changed)d thread was merged into \"%(thread)s\"."
 msgid_plural "%(changed)d threads were merged into \"%(thread)s\"."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:294
+#: threads/views/generic/forum/actions.py:296
 #, python-format
 msgid "%(changed)d thread was closed."
 msgid_plural "%(changed)d threads were closed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:299
+#: threads/views/generic/forum/actions.py:301
 msgid "No threads were closed."
 msgstr ""
 
-#: threads/views/generic/forum/actions.py:310
+#: threads/views/generic/forum/actions.py:312
 #, python-format
 msgid "%(changed)d thread was opened."
 msgid_plural "%(changed)d threads were opened."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:315
+#: threads/views/generic/forum/actions.py:317
 msgid "No threads were opened."
 msgstr ""
 
-#: threads/views/generic/forum/actions.py:330
+#: threads/views/generic/forum/actions.py:332
 #, python-format
 msgid "%(changed)d thread was made visible."
 msgid_plural "%(changed)d threads were made visible."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:335
+#: threads/views/generic/forum/actions.py:337
 msgid "No threads were made visible."
 msgstr ""
 
-#: threads/views/generic/forum/actions.py:350
+#: threads/views/generic/forum/actions.py:352
 #, python-format
 msgid "%(changed)d thread was hidden."
 msgid_plural "%(changed)d threads were hidden."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:355
+#: threads/views/generic/forum/actions.py:357
 msgid "No threads were hidden."
 msgstr ""
 
-#: threads/views/generic/forum/actions.py:370
+#: threads/views/generic/forum/actions.py:372
 #, python-format
 msgid "%(changed)d thread was deleted."
 msgid_plural "%(changed)d threads were deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: threads/views/generic/forum/actions.py:375
+#: threads/views/generic/forum/actions.py:377
 msgid "No threads were deleted."
 msgstr ""
 
@@ -3975,19 +4014,19 @@ msgstr ""
 msgid "Requested thread label does not exist."
 msgstr ""
 
-#: threads/views/labelsadmin.py:34
+#: threads/views/labelsadmin.py:35
 #, python-format
-msgid "New label \"%s\" has been saved."
+msgid "New label \"%(name)s\" has been saved."
 msgstr ""
 
-#: threads/views/labelsadmin.py:38
+#: threads/views/labelsadmin.py:39
 #, python-format
-msgid "Label \"%s\" has been edited."
+msgid "Label \"%(name)s\" has been edited."
 msgstr ""
 
-#: threads/views/labelsadmin.py:44
+#: threads/views/labelsadmin.py:45
 #, python-format
-msgid "Label \"%s\" has been deleted."
+msgid "Label \"%(name)s\" has been deleted."
 msgstr ""
 
 #: users/admin.py:23
@@ -5185,17 +5224,17 @@ msgstr ""
 
 #: users/views/admin/bans.py:49
 #, python-format
-msgid "New ban \"%s\" has been saved."
+msgid "New ban \"%(name)s\" has been saved."
 msgstr ""
 
 #: users/views/admin/bans.py:53
 #, python-format
-msgid "Ban \"%s\" has been edited."
+msgid "Ban \"%(name)s\" has been edited."
 msgstr ""
 
 #: users/views/admin/bans.py:60
 #, python-format
-msgid "Ban \"%s\" has been removed."
+msgid "Ban \"%(name)s\" has been removed."
 msgstr ""
 
 #: users/views/admin/ranks.py:17
@@ -5204,47 +5243,47 @@ msgstr ""
 
 #: users/views/admin/ranks.py:34
 #, python-format
-msgid "New rank \"%s\" has been saved."
+msgid "New rank \"%(name)s\" has been saved."
 msgstr ""
 
 #: users/views/admin/ranks.py:38
 #, python-format
-msgid "Rank \"%s\" has been edited."
+msgid "Rank \"%(name)s\" has been edited."
 msgstr ""
 
-#: users/views/admin/ranks.py:44
+#: users/views/admin/ranks.py:45
 #, python-format
-msgid "Rank \"%s\" is default rank and can't be deleted."
+msgid "Rank \"%(name)s\" is default rank and can't be deleted."
 msgstr ""
 
-#: users/views/admin/ranks.py:48
+#: users/views/admin/ranks.py:49
 #, python-format
-msgid "Rank \"%s\" is assigned to users and can't be deleted."
+msgid "Rank \"%(name)s\" is assigned to users and can't be deleted."
 msgstr ""
 
-#: users/views/admin/ranks.py:54
+#: users/views/admin/ranks.py:55
 #, python-format
-msgid "Rank \"%s\" has been deleted."
+msgid "Rank \"%(name)s\" has been deleted."
 msgstr ""
 
-#: users/views/admin/ranks.py:71
+#: users/views/admin/ranks.py:72
 #, python-format
-msgid "Rank \"%s\" has been moved below \"%s\"."
+msgid "Rank \"%(name)s\" has been moved below \"%(other)s\"."
 msgstr ""
 
-#: users/views/admin/ranks.py:89
+#: users/views/admin/ranks.py:90
 #, python-format
-msgid "Rank \"%s\" has been moved above \"%s\"."
+msgid "Rank \"%(name)s\" has been moved above \"%(other)s\"."
 msgstr ""
 
-#: users/views/admin/ranks.py:103
+#: users/views/admin/ranks.py:104
 #, python-format
-msgid "Rank \"%s\" is already default."
+msgid "Rank \"%(name)s\" is already default."
 msgstr ""
 
-#: users/views/admin/ranks.py:107
+#: users/views/admin/ranks.py:109
 #, python-format
-msgid "Rank \"%s\" has been made default."
+msgid "Rank \"%(name)s\" has been made default."
 msgstr ""
 
 #: users/views/admin/users.py:43
@@ -5322,12 +5361,12 @@ msgstr ""
 
 #: users/views/admin/users.py:171
 #, python-format
-msgid "New user \"%s\" has been registered."
+msgid "New user \"%(user)s\" has been registered."
 msgstr ""
 
-#: users/views/admin/users.py:201
+#: users/views/admin/users.py:202
 #, python-format
-msgid "User \"%s\" has been edited."
+msgid "User \"%(user)s\" has been edited."
 msgstr ""
 
 #: users/views/admin/warnings.py:15
@@ -5336,27 +5375,27 @@ msgstr ""
 
 #: users/views/admin/warnings.py:23
 #, python-format
-msgid "New warning level \"%s\" has been saved."
+msgid "New warning level \"%(name)s\" has been saved."
 msgstr ""
 
 #: users/views/admin/warnings.py:27
 #, python-format
-msgid "Warning level \"%s\" has been edited."
+msgid "Warning level \"%(name)s\" has been edited."
 msgstr ""
 
 #: users/views/admin/warnings.py:33
 #, python-format
-msgid "Warning level \"%s\" has been deleted."
+msgid "Warning level \"%(name)s\" has been deleted."
 msgstr ""
 
 #: users/views/admin/warnings.py:50
 #, python-format
-msgid "Warning level \"%s\" has been moved below \"%s\"."
+msgid "Warning level \"%(name)s\" has been moved below \"%(other)s\"."
 msgstr ""
 
-#: users/views/admin/warnings.py:68
+#: users/views/admin/warnings.py:69
 #, python-format
-msgid "Warning level \"%s\" has been moved above \"%s\"."
+msgid "Warning level \"%(name)s\" has been moved above \"%(other)s\"."
 msgstr ""
 
 #: users/views/api.py:40

misago/threads/tests/test_unreadthreads_view.py

@@ -12,7 +12,7 @@ class AuthenticatedTests(AuthenticatedUserTestCase):
         """empty threads list is rendered"""
         response = self.client.get(reverse('misago:unread_threads'))
         self.assertEqual(response.status_code, 200)
-        self.assertIn("There are no threads from last", response.content)
+        self.assertIn("There are no threads with unread", response.content)
 
     def test_filled_threads_list(self):
         """filled threads list is rendered"""
@@ -22,7 +22,7 @@ class AuthenticatedTests(AuthenticatedUserTestCase):
         # only unread tracker threads are shown on unread list
         response = self.client.get(reverse('misago:unread_threads'))
         self.assertEqual(response.status_code, 200)
-        self.assertIn("There are no threads from last", response.content)
+        self.assertIn("There are no threads with unread", response.content)
 
         # we'll read and reply to first five threads
         for thread in threads[5:]:

misago/threads/views/labelsadmin.py

@@ -23,7 +23,8 @@ class LabelsAdmin(generic.AdminBaseMixin):
         Label.objects.clear_cache()
 
         if self.message_submit:
-            messages.success(request, self.message_submit % target.name)
+            messages.success(
+                request, self.message_submit % {'name': target.name})
 
 
 class LabelsList(LabelsAdmin, generic.ListView):
@@ -31,15 +32,15 @@ class LabelsList(LabelsAdmin, generic.ListView):
 
 
 class NewLabel(LabelsAdmin, generic.ModelFormView):
-    message_submit = _('New label "%s" has been saved.')
+    message_submit = _('New label "%(name)s" has been saved.')
 
 
 class EditLabel(LabelsAdmin, generic.ModelFormView):
-    message_submit = _('Label "%s" has been edited.')
+    message_submit = _('Label "%(name)s" has been edited.')
 
 
 class DeleteLabel(LabelsAdmin, generic.ButtonView):
     def button_action(self, request, target):
         target.delete()
-        message = _('Label "%s" has been deleted.')
-        messages.success(request, message % unicode(target.name))
+        message = _('Label "%(name)s" has been deleted.')
+        messages.success(request, message % {'name': target.name})

misago/users/views/admin/bans.py

@@ -46,16 +46,16 @@ class BansList(BanAdmin, generic.ListView):
 
 
 class NewBan(BanAdmin, generic.ModelFormView):
-    message_submit = _('New ban "%s" has been saved.')
+    message_submit = _('New ban "%(name)s" has been saved.')
 
 
 class EditBan(BanAdmin, generic.ModelFormView):
-    message_submit = _('Ban "%s" has been edited.')
+    message_submit = _('Ban "%(name)s" has been edited.')
 
 
 class DeleteBan(BanAdmin, generic.ButtonView):
     def button_action(self, request, target):
         target.delete()
         Ban.objects.invalidate_cache()
-        message = _('Ban "%s" has been removed.') % unicode(target.name)
-        messages.success(request, message)
+        message = _('Ban "%(name)s" has been removed.')
+        messages.success(request, message % {'name': target.name})

misago/users/views/admin/ranks.py

@@ -31,28 +31,29 @@ class RanksList(RankAdmin, generic.ListView):
 
 
 class NewRank(RankAdmin, generic.ModelFormView):
-    message_submit = _('New rank "%s" has been saved.')
+    message_submit = _('New rank "%(name)s" has been saved.')
 
 
 class EditRank(RankAdmin, generic.ModelFormView):
-    message_submit = _('Rank "%s" has been edited.')
+    message_submit = _('Rank "%(name)s" has been edited.')
 
 
 class DeleteRank(RankAdmin, generic.ButtonView):
     def check_permissions(self, request, target):
+        message_format = {'name': target.name}
         if target.is_default:
-            message = _('Rank "%s" is default rank and '
-                        'can\'t be deleted.')
-            return message % target.name
+            message = _('Rank "%(name)s" is default '
+                        'rank and can\'t be deleted.')
+            return message % message_format
         if target.user_set.exists():
-            message = _('Rank "%s" is assigned to users and '
-                        'can\'t be deleted.')
-            return message % target.name
+            message = _('Rank "%(name)s" is assigned to '
+                        'users and can\'t be deleted.')
+            return message % message_format
 
     def button_action(self, request, target):
         target.delete()
-        message = _('Rank "%s" has been deleted.') % target.name
-        messages.success(request, message)
+        message = _('Rank "%(name)s" has been deleted.')
+        messages.success(request, message % {'name': target.name})
 
 
 class MoveDownRank(RankAdmin, generic.ButtonView):
@@ -68,8 +69,8 @@ class MoveDownRank(RankAdmin, generic.ButtonView):
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
 
-            message = _('Rank "%s" has been moved below "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Rank "%(name)s" has been moved below "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)
 
 
@@ -86,8 +87,8 @@ class MoveUpRank(RankAdmin, generic.ButtonView):
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
 
-            message = _('Rank "%s" has been moved above "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Rank "%(name)s" has been moved above "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)
 
 
@@ -100,9 +101,10 @@ class RankUsers(RankAdmin, generic.TargetedView):
 class DefaultRank(RankAdmin, generic.ButtonView):
     def check_permissions(self, request, target):
         if target.is_default:
-            return _('Rank "%s" is already default.') % target.name
+            message = _('Rank "%(name)s" is already default.')
+            return message % {'name': target.name}
 
     def button_action(self, request, target):
         Rank.objects.make_rank_default(target)
-        message = _('Rank "%s" has been made default.')
-        messages.success(request, message % target.name)
+        message = _('Rank "%(name)s" has been made default.')
+        messages.success(request, message % {'name': target.name})

misago/users/views/admin/users.py

@@ -168,7 +168,7 @@ class UsersList(UserAdmin, generic.ListView):
 class NewUser(UserAdmin, generic.ModelFormView):
     Form = NewUserForm
     template = 'new.html'
-    message_submit = _('New user "%s" has been registered.')
+    message_submit = _('New user "%(user)s" has been registered.')
 
     def handle_form(self, form, request, target):
         User = get_user_model()
@@ -190,7 +190,8 @@ class NewUser(UserAdmin, generic.ModelFormView):
         new_user.update_acl_key()
         new_user.save()
 
-        messages.success(request, self.message_submit % target.username)
+        messages.success(
+            request, self.message_submit % {'user': target.username})
         return redirect('misago:admin:users:accounts:edit',
                         user_id=new_user.id)
 
@@ -198,7 +199,7 @@ class NewUser(UserAdmin, generic.ModelFormView):
 class EditUser(UserAdmin, generic.ModelFormView):
     Form = EditUserForm
     template = 'edit.html'
-    message_submit = _('User "%s" has been edited.')
+    message_submit = _('User "%(user)s" has been edited.')
 
     def real_dispatch(self, request, target):
         target.old_username = target.username
@@ -240,4 +241,5 @@ class EditUser(UserAdmin, generic.ModelFormView):
         target.update_acl_key()
         target.save()
 
-        messages.success(request, self.message_submit % target.username)
+        messages.success(
+            request, self.message_submit % {'user': target.username})

misago/users/views/admin/warnings.py

@@ -20,18 +20,18 @@ class WarningsList(WarningsAdmin, generic.ListView):
 
 
 class NewWarning(WarningsAdmin, generic.ModelFormView):
-    message_submit = _('New warning level "%s" has been saved.')
+    message_submit = _('New warning level "%(name)s" has been saved.')
 
 
 class EditWarning(WarningsAdmin, generic.ModelFormView):
-    message_submit = _('Warning level "%s" has been edited.')
+    message_submit = _('Warning level "%(name)s" has been edited.')
 
 
 class DeleteWarning(WarningsAdmin, generic.ButtonView):
     def button_action(self, request, target):
         target.delete()
-        message = _('Warning level "%s" has been deleted.')
-        messages.success(request, message % unicode(target.name))
+        message = _('Warning level "%(name)s" has been deleted.')
+        messages.success(request, message % {'name': target.name})
 
 
 class MoveDownWarning(WarningsAdmin, generic.ButtonView):
@@ -47,8 +47,9 @@ class MoveDownWarning(WarningsAdmin, generic.ButtonView):
             other_target.save(update_fields=['level'])
             target.save(update_fields=['level'])
 
-            message = _('Warning level "%s" has been moved below "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Warning level "%(name)s" has '
+                        'been moved below "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)
 
 
@@ -65,6 +66,7 @@ class MoveUpWarning(WarningsAdmin, generic.ButtonView):
             other_target.save(update_fields=['level'])
             target.save(update_fields=['level'])
 
-            message = _('Warning level "%s" has been moved above "%s".')
-            targets_names = (target.name, other_target.name)
+            message = _('Warning level "%(name)s" has '
+                        'been moved above "%(other)s".')
+            targets_names = {'name': target.name, 'other': other_target.name}
             messages.success(request, message % targets_names)