Browse Source

Replaced voters with participants, added missing "public poll" message. #28

Rafał Pitoń 11 years ago
parent
commit
2108b4aa90

+ 3 - 3
templates/cranefly/threads/poll_votes.html

@@ -1,12 +1,12 @@
 {% extends "cranefly/layout.html" %}
 {% import "cranefly/macros.html" as macros with context %}
 
-{% block title %}{{ macros.page_title(title=_("Poll Votes"),parent=thread.name) }}{% endblock %}
+{% block title %}{{ macros.page_title(title=_("Poll Participants"),parent=thread.name) }}{% endblock %}
 
 {% block breadcrumb %}{{ super() }} <span class="divider"><i class="icon-chevron-right"></i></span></li>
 {{ macros.parents_list(parents) }}
 <li><a href="{{ url('thread', thread=thread.pk, slug=thread.slug) }}">{{ thread.name }}</a> <span class="divider"><i class="icon-chevron-right"></i></span></li>
-<li class="active">{% trans %}Poll Votes{% endtrans %}
+<li class="active">{% trans %}Poll Participants{% endtrans %}
 {%- endblock %}
 
 {% block container %}
@@ -64,7 +64,7 @@
           </tbody>
         </table>
         {% else %}
-        <p class="lead">{% trans %}Nobody voted on this option.{% endtrans %}</p>
+        <p class="lead">{% trans %}Nobody voted for this option.{% endtrans %}</p>
         {% endif %}
     </div>
     {% if not loop.last %}

+ 5 - 2
templates/cranefly/threads/thread.html

@@ -87,7 +87,7 @@
         {% if poll_form %}
         {% if poll.user_votes and (not poll.user_votes[0] or poll.vote_changing) %}
         {% if poll.user_votes[0] %}
-        <button type="submit" name="change_vote" class="btn btn-primary">{% trans %}Change vote{% endtrans %}</button>
+        <button type="submit" name="change_vote" class="btn btn-primary">{% trans %}Change Vote{% endtrans %}</button>
         {% else %}
         <button type="submit" name="show_options" class="btn btn-primary">{% trans %}Voting Options{% endtrans %}</button>
         {% endif %}
@@ -97,9 +97,12 @@
         {% endif %}
         {% endif %}
         {% if poll.public or acl.threads.can_see_polls_votes(forum) %}
-        <a href="{{ url('thread_poll_details', slug=thread.slug, thread=thread.pk) }}" class="btn">{% trans %}Show voters{% endtrans %}</a>
+        <a href="{{ url('thread_poll_details', slug=thread.slug, thread=thread.pk) }}" class="btn">{% trans %}Participants{% endtrans %}</a>
         {% endif %}
         <p>
+          {% if poll.public %}
+          <strong>{% trans %}Voting is public.{% endtrans %}</strong>
+          {% endif %}
           {% if thread.closed or thread.deleted %}
           {% trans %}Poll has been closed.{% endtrans %}
           {% elif thread.poll.over %}