Set voting messages

app/views/polls/questions/_answers.html.erb

@@ -2,8 +2,8 @@
   <% if can? :answer, question %>
     <% question.question_answers.each do |answer| %>
       <% if @answers_by_question_id[question.id] == answer.title %>
-        <span class="button answered" 
-              title="<%= t("poll_questions.show.voted", answer: answer)%>">
+        <span class="button answered"
+              title="<%= t("poll_questions.show.voted", answer: answer.title)%>">
           <%= answer.title %>
         </span>
       <% else %>

app/views/polls/show.html.erb

@@ -38,6 +38,11 @@
           <%= t("polls.show.already_voted_in_booth") %>
         </div>
       <% else %>
+        <% if current_user && !@poll.votable_by?(current_user) %>
+          <div class="callout warning">
+            <%= t("polls.show.already_voted_in_web") %>
+          </div>
+        <% end %>
         <% @questions.each do |question| %>
           <%= render 'polls/questions/question', question: question %>
         <% end %>

config/locales/en/general.yml

@@ -481,7 +481,8 @@ en:
         help_text_1: "Voting takes place when a citizen proposal supports reaches 1% of the census with voting rights. Voting can also include questions that the City Council ask to the citizens decision."
         help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government."
     show:
-      already_voted_in_booth: "You have already participated in a booth for this poll."
+      already_voted_in_booth: "You have already participated in a physical booth. You can not participate again."
+      already_voted_in_web: "You have already participated in this poll. If you vote again it will be overwritten."
       back: Back to voting
       cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
       signin: Sign in

config/locales/es/general.yml

@@ -481,7 +481,8 @@ es:
         help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía."
         help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno."
     show:
-      already_voted_in_booth: "Ya has participado en esta votación en una urna."
+      already_voted_in_booth: "Ya has participado en esta votación en urnas presenciales, no puedes volver a participar."
+      already_voted_in_web: "Ya has participado en esta votación. Si vuelves a votar se sobreescribirá tu resultado anterior."
       back: Volver a votaciones
       cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
       signin: iniciar sesión