diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index 1d1ec7b1a99..50b80eb6d8c 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -5,6 +5,7 @@ export default Ember.Controller.extend({ isNumber: Ember.computed.equal("poll.type", "number"), isRandom : Ember.computed.equal("poll.order", "random"), isClosed: Ember.computed.equal("poll.status", "closed"), + isPublic: Ember.computed.equal("poll.public", "true"), pollsVoters: Ember.computed.alias("post.polls_voters"), // shows the results when diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs index 1d1e22ad182..d459a0c6845 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs @@ -29,6 +29,12 @@

{{{multipleHelpText}}}

{{/if}} {{/if}} + + {{#if isPublic}} + {{#unless showingResults}} +

{{i18n "poll.public.title"}}

+ {{/unless}} + {{/if}} diff --git a/plugins/poll/assets/javascripts/poll_dialect.js b/plugins/poll/assets/javascripts/poll_dialect.js index 538518fe7dd..787c099b6fd 100644 --- a/plugins/poll/assets/javascripts/poll_dialect.js +++ b/plugins/poll/assets/javascripts/poll_dialect.js @@ -138,6 +138,10 @@ if (help) { info.push(["p", help]); } } + if (attributes[DATA_PREFIX + "public"] === "true") { + info.push(["p", I18n.t("poll.public.title")]); + } + poll.push(info); // 3 - BUTTONS diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml index 59b508c8853..9cad3df38dc 100644 --- a/plugins/poll/config/locales/client.en.yml +++ b/plugins/poll/config/locales/client.en.yml @@ -27,6 +27,9 @@ en: average_rating: "Average rating: %{average}." + public: + title: "Votes submitted to this poll will be made public." + multiple: help: at_least_min_options: