consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames variable, updates text

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-09-15 13:47:53 +02:00
parent 89340d4647
commit 7abd31e4bf
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/debates_controller.rb
View File

@@ -22,7 +22,7 @@ class DebatesController < ApplicationController
def index_customization
@featured_debates = @debates.featured
@proposal_ballots = Proposal.successfull.sort_by_confidence_score
@proposal_successfull_exists = Proposal.successfull.exists?
end
def show

4
app/controllers/proposals_controller.rb
View File

@@ -28,7 +28,7 @@ class ProposalsController < ApplicationController
def index_customization
load_retired
load_proposal_ballots
load_featured if @proposal_ballots.blank?
load_featured unless @proposal_successfull_exists
end
def vote
@@ -99,7 +99,7 @@ class ProposalsController < ApplicationController
end
def load_proposal_ballots
@proposal_ballots = Proposal.successfull.sort_by_confidence_score
@proposal_successfull_exists = Proposal.successfull.exists?
end
end

4
app/views/debates/index.html.erb
View File

@@ -29,11 +29,11 @@
<%= render "shared/banner" %>
<% end %>
<% if @proposal_ballots.present? %>
<% if @proposal_successfull_exists %>
<%= render "proposals/proposal_ballots_banner" %>
<% end %>
<% unless @tag_filter || @search_terms || !has_featured? || @proposal_ballots.present? %>
<% unless @tag_filter || @search_terms || !has_featured? || @proposal_ballots.present? || @proposal_successfull_exists %>
<%= render "featured_debates" %>
<% end %>

3
app/views/proposal_ballots/index.html.erb
View File

@@ -5,8 +5,7 @@
<%= t("proposal_ballots.title") %>
</h2>
<p>
<%= t("proposal_ballots.description_html",
supports: Setting['votes_for_proposal_success'].to_i).html_safe %>
<%= t("proposal_ballots.description_html").html_safe %>
</p>
</div>

2
app/views/proposals/index.html.erb
View File

@@ -31,7 +31,7 @@
<%= render "shared/banner" %>
<% end %>
<% if @proposal_ballots.present? %>
<% if @proposal_successfull_exists %>
<%= render "proposal_ballots_banner" %>
<% elsif @featured_proposals.present? %>
<div id="featured-proposals" class="row featured-proposals">

8
config/locales/en.yml
View File

@@ -374,15 +374,15 @@ en:
submit_button: Save changes
proposal_ballots:
title: "Votings"
description_html: "The proposals that have reached the <strong>required supports <em>(%{supports})</em></strong> will be voted."
description_html: "The following citizen proposals that have reached the <strong>required supports</strong> and will be voted."
date_title: "Dates of participation"
date: "Soon we'll announce the date of vote these proposals."
successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
voting: "next voting"
featured_title: "#VotingProposal"
featured_title: "#NextVoting"
nothing_to_vote: "There is nothing to vote at the moment."
info: "There are proposals that have reached the required supports and will be voted."
button: "I want to vote"
info: "New proposals that have reached the voting phase."
button: "I want to decide"
proposal_notifications:
new:
title: "Send message"

8
config/locales/es.yml
View File

@@ -374,15 +374,15 @@ es:
submit_button: Guardar cambios
proposal_ballots:
title: "Votaciones"
description_html: "Las propuestas que han alcanzado el <strong>número de apoyos necesarios <em>(%{supports})</em></strong> pasarán a votación."
description_html: "Las siguientes propuestas ciudadanas han alcanzado el <strong>número de apoyos necesarios</strong> y pasarán a votación."
date_title: "Fechas de participación"
date: "En breve anunciaremos la fecha de votación de estas propuestas."
successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
voting: "próxima votación"
featured_title: "#VotaUnaPropuesta"
featured_title: "#PróximaVotación"
nothing_to_vote: "No hay nada que votar en este momento."
info: "Algunas propuestas ya han conseguido los apoyos para pasar a votación."
button: "Quiero participar"
info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
button: "Quiero decidir"
proposal_notifications:
new:
title: "Enviar mensaje"