Browse Source

Changed wording

Rafał Pitoń 10 years ago
parent
commit
e765dd44ff

+ 1 - 1
misago/templates/misago/thread/post.html

@@ -1,5 +1,5 @@
 {% load i18n misago_avatars %}
-<div class="media post">
+<div id="post-{{ post.pk }}" class="media post">
   {% if post.poster %}
   <a class="user-avatar pull-left" href="{% url USER_PROFILE_URL user_slug=post.poster.slug user_id=post.poster.id %}">
     <img class="media-object" src="{{ post.poster|avatar:100 }}" alt="{% trans "Poster avatar" %}">

+ 3 - 0
misago/templates/misago/thread/replies.html

@@ -89,5 +89,8 @@
 {{ block.super }}
 {% if user.is_authenticated %}
   {% include "misago/thread/actions_js.html" %}
+  {% if forum.acl.can_hide_events %}
+    {% include "misago/thread/events_js.html" %}
+  {% endif %}
 {% endif %}
 {% endblock javascripts %}

+ 1 - 1
misago/templates/misago/thread/thread_actions.html

@@ -4,7 +4,7 @@
     {% csrf_token %}
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
       <span class="fa fa-gears"></span>
-      {% trans "Thread moderation" %}
+      {% trans "Thread actions" %}
     </button>
     <ul class="dropdown-menu scrollable" role="menu">
       {% for action in thread_actions %}

+ 1 - 1
misago/templates/misago/threads/base.html

@@ -73,7 +73,7 @@
               </div>
               {% else %}
               <div class="thread-replies new-replies">
-                <span class="label label-primary tooltip-top" title="{% blocktrans trimmed with replies=thread.unread_replies|intcomma count counter=thread.unread_replies %}{{ replies }} new reply{% plural %}{{ replies }} new replies{% endblocktrans %}">
+                <span class="label label-primary tooltip-top" title="{% blocktrans trimmed with replies=thread.unread_replies|intcomma count counter=thread.unread_replies %}{{ replies }} unread reply{% plural %}{{ replies }} unread replies{% endblocktrans %}">
                   <span class="fa fa-signal fa-fw"></span>
                   {{ thread.unread_replies|intcomma }}
                 </span>

+ 3 - 3
misago/threads/tests/test_thread_view.py

@@ -91,12 +91,12 @@ class ThreadViewModerationTests(ThreadViewTestCase):
         self.override_acl({'can_change_threads_labels': 0})
         response = self.client.get(self.thread.get_absolute_url())
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn("Moderate thread", response.content)
+        self.assertNotIn("Thread actions", response.content)
 
         self.override_acl({'can_change_threads_labels': 2})
         response = self.client.get(self.thread.get_absolute_url())
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn("Moderate thread", response.content)
+        self.assertNotIn("Thread actions", response.content)
 
         test_label = Label.objects.create(name="Foxtrot", slug="foxtrot")
         test_label.forums.add(self.forum)
@@ -105,7 +105,7 @@ class ThreadViewModerationTests(ThreadViewTestCase):
         self.override_acl({'can_change_threads_labels': 0})
         response = self.client.get(self.thread.get_absolute_url())
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn("Moderate thread", response.content)
+        self.assertNotIn("Thread actions", response.content)
 
         self.override_acl({'can_change_threads_labels': 2})
         response = self.client.get(self.thread.get_absolute_url())