Fixed #157

misago/apps/admin/widgets.py

@@ -335,12 +335,12 @@ class ListWidget(BaseWidget):
                             request.messages.set_flash(message, message.type, self.admin.id)
                             return redirect(redirect_url)
                     except AttributeError:
-                        message = Message(_("Action requested is incorrect."))
+                        message = Message(_("Requested action is incorrect."))
                 else:
                     if 'list_items' in list_form.errors:
                         message = Message(self.nothing_checked_message)
                     elif 'list_action' in list_form.errors:
-                        message = Message(_("Action requested is incorrect."))
+                        message = Message(_("Requested action is incorrect."))
                     else:
                         message = Message(list_form.non_field_errors()[0])
                 message.type = 'error'

misago/apps/threadtype/list/views.py

@@ -82,7 +82,7 @@ class ThreadsListBaseView(ViewBase):
                     self.message = Message(_("You have to select at least one thread."), 'error')
             else:
                 if 'list_action' in self.form.errors:
-                    self.message = Message(_("Action requested is incorrect."), 'error')
+                    self.message = Message(_("Requested action is incorrect."), 'error')
                 else:
                     self.message = Message(form.non_field_errors()[0], 'error')
         else:

misago/apps/threadtype/thread/views.py

@@ -119,7 +119,7 @@ class ThreadBaseView(ViewBase):
                     self.message = Message(e.messages[0], 'error')
             else:
                 if 'thread_action' in self.thread_form.errors:
-                    self.message = Message(_("Action requested is incorrect."), 'error')
+                    self.message = Message(_("Requested action is incorrect."), 'error')
                 else:
                     self.message = Message(form.non_field_errors()[0], 'error')
         else:
@@ -166,7 +166,7 @@ class ThreadBaseView(ViewBase):
                     self.message = Message(_("You have to select at least one post."), 'error')
             else:
                 if 'list_action' in self.posts_form.errors:
-                    self.message = Message(_("Action requested is incorrect."), 'error')
+                    self.message = Message(_("Requested action is incorrect."), 'error')
                 else:
                     self.message = Message(posts_form.non_field_errors()[0], 'error')
         else:

templates/cranefly/reports/thread.html

@@ -198,15 +198,15 @@
               <form action="{{ request_path }}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
                 <input type="hidden" name="origin" value="thread_form">
-                <input type="hidden" name="thread_action" value="normal">
-                <button type="submit" class="btn btn-link btn-resolve tooltip-top" title="{% trans %}Set this report as bogus{% endtrans %}"><i class="icon-ok"></i> {% trans %}Resolved{% endtrans %}</button>
+                <input type="hidden" name="thread_action" value="sticky">
+                <button type="submit" class="btn btn-link btn-bogus tooltip-top" title="{% trans %}Set this report as resolved{% endtrans %}"><i class="icon-remove"></i> {% trans %}Bogus{% endtrans %}</button>
               </form>
               {% elif thread.weight != 0 %}
               <form action="{{ request_path }}" class="form-inline" method="post">
                 <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
                 <input type="hidden" name="origin" value="thread_form">
-                <input type="hidden" name="thread_action" value="sticky">
-                <button type="submit" class="btn btn-link btn-bogus tooltip-top" title="{% trans %}Set this report as resolved{% endtrans %}"><i class="icon-remove"></i> {% trans %}Bogus{% endtrans %}</button>
+                <input type="hidden" name="thread_action" value="normal">
+                <button type="submit" class="btn btn-link btn-resolve tooltip-top" title="{% trans %}Set this report as bogus{% endtrans %}"><i class="icon-ok"></i> {% trans %}Resolved{% endtrans %}</button>
               </form>
               {% endif %}
             </div>