diff --git a/po/ca/vote.po b/po/ca/vote.po index cf5df6c..3438cfa 100644 --- a/po/ca/vote.po +++ b/po/ca/vote.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-29 21:18-0600\n" +"POT-Creation-Date: 2025-03-30 12:01-0600\n" "PO-Revision-Date: 2025-03-29 20:41-0600\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,212 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../views/login.erb:1 +#: ../views/home.erb:1 ../views/layout.erb:10 +msgid "Home" +msgstr "Inici" + +#: ../views/home.erb:3 +msgid "Votes" +msgstr "Votacions" + +#: ../views/home.erb:11 +msgid "(Draft, organized by you)" +msgstr "(Esborrany, organitzada per tu)" + +#: ../views/home.erb:12 ../views/votes_show_draft.erb:1 +msgid "(Draft)" +msgstr "(Esborrany)" + +#: ../views/home.erb:15 +msgid "(Open, organized by you)" +msgstr "(Oberta, organitzada per tu)" + +#: ../views/home.erb:16 +msgid "(Open)" +msgstr "(Oberta)" + +#: ../views/home.erb:19 +msgid "(Closed, organized by you)" +msgstr "(Tancada, organitzada per tu)" + +#: ../views/home.erb:20 +msgid "(Closed)" +msgstr "(Tancada)" + +#: ../views/home.erb:28 ../views/votes_new.erb:12 +msgid "Create new vote" +msgstr "Crear una nova votació" + +#: ../views/layout.erb:5 +msgid "Vote" +msgstr "Votació" + +#: ../views/layout.erb:9 +msgid "Logged in as %{email}." +msgstr "Estàs connectada com a %{email}." + +#: ../views/layout.erb:9 +msgid "Logout" +msgstr "Desconnexió" + +#: ../views/layout.erb:12 ../views/login.erb:1 ../views/login.erb:14 msgid "Login" msgstr "Connexió" -#: ../views/login.erb:7 +#: ../views/login.erb:7 ../views/signup.erb:5 ../views/votes_edit.erb:51 +#: ../views/votes_show_closed.erb:69 ../views/votes_show_open.erb:58 msgid "Email" msgstr "Correu" -#: ../views/login.erb:11 +#: ../views/login.erb:11 ../views/signup.erb:9 msgid "Password" msgstr "Contrasenya" + +#: ../views/login.erb:16 ../views/signup.erb:1 ../views/signup.erb:12 +msgid "Create account" +msgstr "Crear un compte" + +#: ../views/votes_edit.erb:1 +msgid "Edit draft vote" +msgstr "Editar un esborrany de votació" + +#: ../views/votes_edit.erb:5 ../views/votes_new.erb:5 +msgid "Title" +msgstr "Títol" + +#: ../views/votes_edit.erb:9 ../views/votes_edit.erb:33 +#: ../views/votes_new.erb:9 +msgid "Description" +msgstr "Descripció" + +#: ../views/votes_edit.erb:12 ../views/votes_show_open.erb:23 +msgid "Save" +msgstr "Guardar" + +#: ../views/votes_edit.erb:15 ../views/votes_show_draft.erb:13 +msgid "Candidates" +msgstr "Candidats" + +#: ../views/votes_edit.erb:21 +msgid "Delete" +msgstr "Suprimir" + +#: ../views/votes_edit.erb:25 +msgid "Add candidate" +msgstr "Afegeix un candidat" + +#: ../views/votes_edit.erb:29 +msgid "Name" +msgstr "Nom" + +#: ../views/votes_edit.erb:36 ../views/votes_edit.erb:54 +#: ../views/votes_show_closed.erb:72 ../views/votes_show_open.erb:61 +msgid "Add" +msgstr "Afegir" + +#: ../views/votes_edit.erb:39 ../views/votes_show_closed.erb:49 +#: ../views/votes_show_draft.erb:5 ../views/votes_show_open.erb:34 +msgid "Organizers" +msgstr "Organitzadores" + +#: ../views/votes_edit.erb:47 ../views/votes_show_closed.erb:65 +#: ../views/votes_show_open.erb:54 +msgid "Add organizer" +msgstr "Afegeix organitzadora" + +#: ../views/votes_edit.erb:57 ../views/votes_show_closed.erb:59 +#: ../views/votes_show_open.erb:44 +msgid "Actions for organizers" +msgstr "Accions per les organitzadores" + +#: ../views/votes_edit.erb:60 +msgid "Open vote to participants" +msgstr "Obrir la votació als participants" + +#: ../views/votes_edit.erb:63 +msgid "Delete vote" +msgstr "Suprimir la votació" + +#: ../views/votes_new.erb:1 +msgid "New vote" +msgstr "Nova votació" + +#: ../views/votes_show_closed.erb:5 +msgid "All ratings" +msgstr "Totes les valoracions" + +#: ../views/votes_show_closed.erb:9 +msgid "Participant" +msgstr "Participant" + +#: ../views/votes_show_closed.erb:26 +msgid "Results" +msgstr "Resultats" + +#: ../views/votes_show_closed.erb:30 +msgid "Rank" +msgstr "Rang" + +#: ../views/votes_show_closed.erb:31 +msgid "Candidate" +msgstr "Candidat" + +#: ../views/votes_show_closed.erb:32 +msgid "Majority Judgment" +msgstr "Judici majoritari" + +#: ../views/votes_show_closed.erb:33 +msgid "Proponents" +msgstr "Defensores" + +#: ../views/votes_show_closed.erb:34 +msgid "Opponents" +msgstr "Detractores" + +#: ../views/votes_show_closed.erb:62 +msgid "Reopen voting period" +msgstr "Reobrir el període de votació" + +#: ../views/votes_show_open.erb:5 +msgid "Your ratings" +msgstr "Les teves valoracions" + +#: ../views/votes_show_open.erb:26 +msgid "Participants" +msgstr "Participants" + +#: ../views/votes_show_open.erb:47 +msgid "Change back to draft vote" +msgstr "Tornar a l'esborrany de votació" + +#: ../views/votes_show_open.erb:51 +msgid "Close votes and show results" +msgstr "Tancar la votació i veure els resultats" + +#: ../vote.rb:59 +msgid "Awful" +msgstr "Molt malament" + +#: ../vote.rb:60 +msgid "Very bad" +msgstr "Malament" + +#: ../vote.rb:61 +msgid "Bad" +msgstr "Poc bé" + +#: ../vote.rb:62 +msgid "Mediocre" +msgstr "Mig bé" + +#: ../vote.rb:63 +msgid "Good" +msgstr "Bé" + +#: ../vote.rb:64 +msgid "Very good" +msgstr "Molt bé" + +#: ../vote.rb:65 +msgid "Excellent" +msgstr "Excel·lent" diff --git a/po/vote.pot b/po/vote.pot index b7088a4..d4410f9 100644 --- a/po/vote.pot +++ b/po/vote.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-29 21:18-0600\n" -"PO-Revision-Date: 2025-03-29 21:18-0600\n" +"POT-Creation-Date: 2025-03-30 12:01-0600\n" +"PO-Revision-Date: 2025-03-30 12:01-0600\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -18,14 +18,212 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../views/login.erb:1 +#: ../views/home.erb:1 ../views/layout.erb:10 +msgid "Home" +msgstr "" + +#: ../views/home.erb:3 +msgid "Votes" +msgstr "" + +#: ../views/home.erb:11 +msgid "(Draft, organized by you)" +msgstr "" + +#: ../views/home.erb:12 ../views/votes_show_draft.erb:1 +msgid "(Draft)" +msgstr "" + +#: ../views/home.erb:15 +msgid "(Open, organized by you)" +msgstr "" + +#: ../views/home.erb:16 +msgid "(Open)" +msgstr "" + +#: ../views/home.erb:19 +msgid "(Closed, organized by you)" +msgstr "" + +#: ../views/home.erb:20 +msgid "(Closed)" +msgstr "" + +#: ../views/home.erb:28 ../views/votes_new.erb:12 +msgid "Create new vote" +msgstr "" + +#: ../views/layout.erb:5 +msgid "Vote" +msgstr "" + +#: ../views/layout.erb:9 +msgid "Logged in as %{email}." +msgstr "" + +#: ../views/layout.erb:9 +msgid "Logout" +msgstr "" + +#: ../views/layout.erb:12 ../views/login.erb:1 ../views/login.erb:14 msgid "Login" msgstr "" -#: ../views/login.erb:7 +#: ../views/login.erb:7 ../views/signup.erb:5 ../views/votes_edit.erb:51 +#: ../views/votes_show_closed.erb:69 ../views/votes_show_open.erb:58 msgid "Email" msgstr "" -#: ../views/login.erb:11 +#: ../views/login.erb:11 ../views/signup.erb:9 msgid "Password" msgstr "" + +#: ../views/login.erb:16 ../views/signup.erb:1 ../views/signup.erb:12 +msgid "Create account" +msgstr "" + +#: ../views/votes_edit.erb:1 +msgid "Edit draft vote" +msgstr "" + +#: ../views/votes_edit.erb:5 ../views/votes_new.erb:5 +msgid "Title" +msgstr "" + +#: ../views/votes_edit.erb:9 ../views/votes_edit.erb:33 +#: ../views/votes_new.erb:9 +msgid "Description" +msgstr "" + +#: ../views/votes_edit.erb:12 ../views/votes_show_open.erb:23 +msgid "Save" +msgstr "" + +#: ../views/votes_edit.erb:15 ../views/votes_show_draft.erb:13 +msgid "Candidates" +msgstr "" + +#: ../views/votes_edit.erb:21 +msgid "Delete" +msgstr "" + +#: ../views/votes_edit.erb:25 +msgid "Add candidate" +msgstr "" + +#: ../views/votes_edit.erb:29 +msgid "Name" +msgstr "" + +#: ../views/votes_edit.erb:36 ../views/votes_edit.erb:54 +#: ../views/votes_show_closed.erb:72 ../views/votes_show_open.erb:61 +msgid "Add" +msgstr "" + +#: ../views/votes_edit.erb:39 ../views/votes_show_closed.erb:49 +#: ../views/votes_show_draft.erb:5 ../views/votes_show_open.erb:34 +msgid "Organizers" +msgstr "" + +#: ../views/votes_edit.erb:47 ../views/votes_show_closed.erb:65 +#: ../views/votes_show_open.erb:54 +msgid "Add organizer" +msgstr "" + +#: ../views/votes_edit.erb:57 ../views/votes_show_closed.erb:59 +#: ../views/votes_show_open.erb:44 +msgid "Actions for organizers" +msgstr "" + +#: ../views/votes_edit.erb:60 +msgid "Open vote to participants" +msgstr "" + +#: ../views/votes_edit.erb:63 +msgid "Delete vote" +msgstr "" + +#: ../views/votes_new.erb:1 +msgid "New vote" +msgstr "" + +#: ../views/votes_show_closed.erb:5 +msgid "All ratings" +msgstr "" + +#: ../views/votes_show_closed.erb:9 +msgid "Participant" +msgstr "" + +#: ../views/votes_show_closed.erb:26 +msgid "Results" +msgstr "" + +#: ../views/votes_show_closed.erb:30 +msgid "Rank" +msgstr "" + +#: ../views/votes_show_closed.erb:31 +msgid "Candidate" +msgstr "" + +#: ../views/votes_show_closed.erb:32 +msgid "Majority Judgment" +msgstr "" + +#: ../views/votes_show_closed.erb:33 +msgid "Proponents" +msgstr "" + +#: ../views/votes_show_closed.erb:34 +msgid "Opponents" +msgstr "" + +#: ../views/votes_show_closed.erb:62 +msgid "Reopen voting period" +msgstr "" + +#: ../views/votes_show_open.erb:5 +msgid "Your ratings" +msgstr "" + +#: ../views/votes_show_open.erb:26 +msgid "Participants" +msgstr "" + +#: ../views/votes_show_open.erb:47 +msgid "Change back to draft vote" +msgstr "" + +#: ../views/votes_show_open.erb:51 +msgid "Close votes and show results" +msgstr "" + +#: ../vote.rb:59 +msgid "Awful" +msgstr "" + +#: ../vote.rb:60 +msgid "Very bad" +msgstr "" + +#: ../vote.rb:61 +msgid "Bad" +msgstr "" + +#: ../vote.rb:62 +msgid "Mediocre" +msgstr "" + +#: ../vote.rb:63 +msgid "Good" +msgstr "" + +#: ../vote.rb:64 +msgid "Very good" +msgstr "" + +#: ../vote.rb:65 +msgid "Excellent" +msgstr "" diff --git a/views/home.erb b/views/home.erb index cafb31e..4a3bcb6 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,25 +1,23 @@ -

Home

+

<%= _("Home") %>

-

Hello, <%= current_user.email %>.

- -

Votes

+

<%= _("Votes") %>

    <% @votes.reverse.each do |vote| %>
  • <%= vote.title %> <% case vote.state - when "draft" %> - <% if vote.users.exists?(current_user.id) %>(Draft, organized by you) - <% else %>(Draft) + when 'draft' %> + <% if vote.users.exists?(current_user.id) %><%= _("(Draft, organized by you)") %> + <% else %><%= _("(Draft)") %> <% end %> - <% when "open" %> - <% if vote.users.exists?(current_user.id) %>(Open, organized by you) - <% else %>(Open) + <% when 'open' %> + <% if vote.users.exists?(current_user.id) %><%= _("(Open, organized by you)") %> + <% else %><%= _("(Open)") %> <% end %> - <% when "closed" %> - <% if vote.users.exists?(current_user.id) %>(Closed, organized by you) - <% else %>(Closed) + <% when 'closed' %> + <% if vote.users.exists?(current_user.id) %><%= _("(Closed, organized by you)") %> + <% else %><%= _("(Closed)") %> <% end %> <% end %>
  • @@ -27,5 +25,5 @@
- +
diff --git a/views/layout.erb b/views/layout.erb index 64b59f8..defbed5 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -2,14 +2,14 @@ - Title + <%= _("Vote") %> <% if current_user %> -

Logged in as <%= current_user.email %>. Logout

-

Home

+

<%= _("Logged in as %{email}.") % { email: current_user.email } %> <%= _("Logout") %>

+

<%= _("Home") %>

<% else %> -

Login

+

<%= _("Login") %>

<% end %> <%= yield %> diff --git a/views/login.erb b/views/login.erb index 2c64001..fd64e04 100644 --- a/views/login.erb +++ b/views/login.erb @@ -11,6 +11,6 @@

- + -Create account +<%= _("Create account") %> diff --git a/views/signup.erb b/views/signup.erb index 72e4551..3ee2e58 100644 --- a/views/signup.erb +++ b/views/signup.erb @@ -1,13 +1,13 @@ -

Create account

+

<%= _("Create account") %>

- +

- +

- +
diff --git a/views/votes_edit.erb b/views/votes_edit.erb index a9414f1..b57d28b 100644 --- a/views/votes_edit.erb +++ b/views/votes_edit.erb @@ -1,42 +1,42 @@ -

Edit draft vote

+

<%= _("Edit draft vote") %>

- +

- +

- +
-

Candidates

+

<%= _("Candidates") %>

<% @vote.candidates.each do |candidate| %>

<%= candidate.name %>

<%= candidate.description %>

- +
<% end %> -

Add candidate

+

<%= _("Add candidate") %>

- +

- +

- +
-

Organizers

+

<%= _("Organizers") %>

    <% @vote.organizers.each do |organizer| %> @@ -44,21 +44,21 @@ <% end %>
-

Add organizer

+

<%= _("Add organizer") %>

- +

- +
-

Actions for organizers

+

<%= _("Actions for organizers") %>

- +
- +
diff --git a/views/votes_new.erb b/views/votes_new.erb index 3a6a07e..66d3e23 100644 --- a/views/votes_new.erb +++ b/views/votes_new.erb @@ -1,13 +1,13 @@ -

New vote

+

<%= _("New vote") %>

- +

- +

- +
diff --git a/views/votes_show_closed.erb b/views/votes_show_closed.erb index 8098205..f75958f 100644 --- a/views/votes_show_closed.erb +++ b/views/votes_show_closed.erb @@ -2,11 +2,11 @@

<%= @vote.description %>

-

All ratings

+

<%= _("All ratings") %>

- + <% @vote.candidates.each do |candidate| %> <% end %> @@ -23,15 +23,15 @@ <% end %>
Participant<%= _("Participant") %><%= candidate.name %>
-

Results

+

<%= _("Results") %>

- - - - - + + + + + <% i = 0 %> <% @vote.candidates.sort { |a, b| a.mj <=> b.mj }.reverse.each do |candidate| %> @@ -46,7 +46,7 @@ <% end %>
RankCandidateMajority JudgmentProponentsOpponents<%= _("Rank") %><%= _("Candidate") %><%= _("Majority Judgment") %><%= _("Proponents") %><%= _("Opponents") %>
-

Organizers

+

<%= _("Organizers") %>

    <% @vote.organizers.each do |organizer| %> @@ -56,20 +56,20 @@ <% if @vote.users.exists?(current_user.id) %> -

    Actions for organizers

    +

    <%= _("Actions for organizers") %>

    - +
    -

    Add organizer

    +

    <%= _("Add") %>

    - +

    - +
    <% end %> diff --git a/views/votes_show_draft.erb b/views/votes_show_draft.erb index e63c258..8e3e51d 100644 --- a/views/votes_show_draft.erb +++ b/views/votes_show_draft.erb @@ -1,8 +1,8 @@ -

    <%= @vote.title %> (Draft)

    +

    <%= @vote.title %> <%= _("(Draft)") %>

    <%= @vote.description %>

    -

    Organizers

    +

    <%= _("Organizers") %>

      <% @vote.organizers.each do |organizer| %> @@ -10,7 +10,7 @@ <% end %>
    -

    Candidates

    +

    <%= _("Candidates") %>

    <% @vote.candidates.each do |candidate| %>

    <%= candidate.name %>

    diff --git a/views/votes_show_open.erb b/views/votes_show_open.erb index b9d8943..f2e0449 100644 --- a/views/votes_show_open.erb +++ b/views/votes_show_open.erb @@ -2,9 +2,7 @@

    <%= @vote.description %>

    -

    Your ratings

    - -

    Hello, <%= current_user.email %>.

    +

    <%= _("Your ratings") %>

      @@ -22,10 +20,10 @@ <% end %>
    - +
    -

    Participants

    +

    <%= _("Participants") %>

      <% @vote.ratings.collect { |rating| rating.user }.uniq.each do |user| %> @@ -33,7 +31,7 @@ <% end %>
    -

    Organizers

    +

    <%= _("Organizers") %>

      <% @vote.organizers.each do |organizer| %> @@ -43,24 +41,24 @@ <% if @vote.users.exists?(current_user.id) %> -

      Actions for organizers

      +

      <%= _("Actions for organizers") %>

      - +
      - +
      -

      Add organizer

      +

      <%= _("Add organizer") %>

      - +

      - +
      <% end %> diff --git a/vote.rb b/vote.rb index b939829..6b9dcb4 100644 --- a/vote.rb +++ b/vote.rb @@ -10,7 +10,7 @@ class Vote < ActiveRecord::Base has_many :ratings, dependent: :destroy has_many :organizers, dependent: :destroy has_many :users, through: :organizers - validates :state, inclusion: { in: ["draft", "open", "closed"] } + validates :state, inclusion: { in: ['draft', 'open', 'closed'] } end class Candidate < ActiveRecord::Base @@ -50,21 +50,21 @@ def verify_password(password, hash) BCrypt::Password.new(hash) == password end -enable :sessions -set :values, [ { :id => 1, :label => "Awful" }, - { :id => 2, :label => "Very bad" }, - { :id => 3, :label => "Bad" }, - { :id => 4, :label => "Mediocre" }, - { :id => 5, :label => "Good" }, - { :id => 6, :label => "Very good" }, - { :id => 7, :label => "Excellent" } ] -MajorityJudgment.values = settings.values - include GetText set_output_charset('UTF-8') bindtextdomain('vote', 'locale') set_locale('ca') +enable :sessions +set :values, [ { :id => 1, :label => _("Awful") }, + { :id => 2, :label => _("Very bad") }, + { :id => 3, :label => _("Bad") }, + { :id => 4, :label => _("Mediocre") }, + { :id => 5, :label => _("Good") }, + { :id => 6, :label => _("Very good") }, + { :id => 7, :label => _("Excellent") } ] +MajorityJudgment.values = settings.values + get '/' do redirect '/login' unless current_user @votes = Vote.all @@ -117,7 +117,7 @@ post '/votes' do @vote = Vote.create(secure_id: SecureRandom.hex(8), title: params[:title], description: params[:description], - state: "draft") + state: 'draft') @vote.users << current_user redirect '/votes/' + @vote.secure_id end @@ -126,18 +126,18 @@ get '/votes/:id' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) case @vote.state - when "draft" + when 'draft' if @vote.users.exists?(current_user.id) erb :votes_edit else erb :votes_show_draft end - when "open" + when 'open' erb :votes_show_open - when "closed" + when 'closed' erb :votes_show_closed else - @vote.state = "draft" + @vote.state = 'draft' @vote.save erb :votes_edit end @@ -146,7 +146,7 @@ end post '/votes/:id/edit' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "draft" and @vote.users.exists?(current_user.id) + redirect '/votes/' + @vote.secure_id unless @vote.state == 'draft' and @vote.users.exists?(current_user.id) @vote.title = params[:title] @vote.description = params[:description] @vote.save @@ -156,7 +156,7 @@ end post '/votes/:id/candidates' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "draft" and @vote.users.exists?(current_user.id) + redirect '/votes/' + @vote.secure_id unless @vote.state == 'draft' and @vote.users.exists?(current_user.id) @candidate = Candidate.new(name: params[:name], description: params[:description]) @candidate.vote = @vote @@ -167,7 +167,7 @@ end post '/votes/:id/candidates/:cid/delete' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "draft" and @vote.users.exists?(current_user.id) + redirect '/votes/' + @vote.secure_id unless @vote.state == 'draft' and @vote.users.exists?(current_user.id) @candidate = Candidate.find(params[:cid]) @candidate.destroy redirect '/votes/' + @vote.secure_id @@ -176,8 +176,8 @@ end post '/votes/:id/open' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "draft" and @vote.users.exists?(current_user.id) - @vote.state = "open" + redirect '/votes/' + @vote.secure_id unless @vote.state == 'draft' and @vote.users.exists?(current_user.id) + @vote.state = 'open' @vote.save redirect '/votes/' + @vote.secure_id end @@ -185,9 +185,9 @@ end post '/votes/:id/draft' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "open" and @vote.users.exists?(current_user.id) + redirect '/votes/' + @vote.secure_id unless @vote.state == 'open' and @vote.users.exists?(current_user.id) @vote.ratings.each {|r| r.destroy} - @vote.state = "draft" + @vote.state = 'draft' @vote.save redirect '/votes/' + @vote.secure_id end @@ -195,8 +195,8 @@ end post '/votes/:id/close' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "open" and @vote.users.exists?(current_user.id) - @vote.state = "closed" + redirect '/votes/' + @vote.secure_id unless @vote.state == 'open' and @vote.users.exists?(current_user.id) + @vote.state = 'closed' @vote.save redirect '/votes/' + @vote.secure_id end @@ -204,8 +204,8 @@ end post '/votes/:id/reopen' do redirect '/login' unless current_user @vote = Vote.find_by(secure_id: params[:id]) - redirect '/votes/' + @vote.secure_id unless @vote.state == "closed" and @vote.users.exists?(current_user.id) - @vote.state = "open" + redirect '/votes/' + @vote.secure_id unless @vote.state == 'closed' and @vote.users.exists?(current_user.id) + @vote.state = 'open' @vote.save redirect '/votes/' + @vote.secure_id end