diff --git a/app/controllers/budgets/ballot/lines_controller.rb b/app/controllers/budgets/ballot/lines_controller.rb
index 5483f40a3..c64efbd84 100644
--- a/app/controllers/budgets/ballot/lines_controller.rb
+++ b/app/controllers/budgets/ballot/lines_controller.rb
@@ -20,11 +20,11 @@ module Budgets
#@ballot.set_geozone(@geozone)
#@current_user.update(representative_id: nil)
if request.get?
- redirect_to @spending_proposal, notice: t('spending_proposals.notice.voted')
+ redirect_to @investment, notice: t('budget_investments.notice.voted')
end
else
if request.get?
- redirect_to @spending_proposal, notice: t('spending_proposals.notice.could_not_vote')
+ redirect_to @investment, notice: t('budget_investments.notice.could_not_vote')
else
render :new
end
@@ -74,4 +74,4 @@ module Budgets
end
end
-end
\ No newline at end of file
+end
diff --git a/app/views/budgets/ballot/_progress_bar.html.erb b/app/views/budgets/ballot/_progress_bar.html.erb
index a01d8395e..7c3190ba6 100644
--- a/app/views/budgets/ballot/_progress_bar.html.erb
+++ b/app/views/budgets/ballot/_progress_bar.html.erb
@@ -20,7 +20,7 @@
- <%= content_tag(:h2, t("management.investments.filters.unfeasible")) if params[:unfeasible].present? %>
- <%= content_tag(:h2, t("management.investments.filters.by_geozone", geozone: @geozone_name)) if @geozone_name.present? %>
+ <%= content_tag(:h2, t("management.budget_investments.filters.unfeasible")) if params[:unfeasible].present? %>
+ <%= content_tag(:h2, t("management.budget_investments.filters.heading", heading: @heading.name)) if @heading.present? %>
<% if params[:search].present? %>
<%= page_entries_info @investments %>
- <%= t("management.investments.search_results", count: @investments.size, search_term: params[:search]) %>
+ <%= t("management.budget_investments.search_results", count: @investments.size, search_term: params[:search]) %>
<% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 8511dbfc4..c9bd21c18 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -283,9 +283,6 @@ en:
proposal_search:
button: Search
placeholder: Search proposals by title, code, description or question
- budget_investment_search:
- button: Search
- placeholder: Search investments by title or description
spending_proposal_search:
button: Search
placeholder: Search spending proposals by title or description
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9887eb625..6972ef4ed 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,12 +34,18 @@ en:
close: Close
menu: Menu
budgets:
+ progress_bar:
+ available: Available
phases:
accepting: Accepting investment projects
on_hold: On Hold
selecting: Selecting investment projects
balloting: Voting investment projects
finished: Finished
+ budget_investments:
+ notice:
+ could_not_vote: Could not vote
+ voted: Vote stored successfully
comments:
comment:
admin: Administrator
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9dbd241d9..4bafd0c70 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -34,12 +34,18 @@ es:
close: Cerrar
menu: Menú
budgets:
+ progress_bar:
+ available: Disponible
phases:
accepting: Aceptación de proyectos
on_hold: En espera
selecting: Selección de proyectos
balloting: Votación de proyectos
finished: Terminado
+ budget_investments:
+ notice:
+ could_not_vote: No se pudo votar
+ voted: Voto emitido con éxito
comments:
comment:
admin: Administrador
diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml
index 373aabf73..636e42349 100644
--- a/config/locales/management.en.yml
+++ b/config/locales/management.en.yml
@@ -51,8 +51,8 @@ en:
print_spending_proposals: Print spending proposals
support_spending_proposals: Support spending proposals
create_budget_investment: Create budget investment
- print_budget_investment: Print budget investment
- support_budget_investment: Support budget investment
+ print_budget_investments: Print Budget Investments
+ support_budget_investments: Support Budget Investments
users: Users
edit_user_accounts: Edit user account
user_invites: User's invites
@@ -65,6 +65,8 @@ en:
proposals_info: Create yor proposal on http://url.consul
proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out.
proposals_title: 'Proposals:'
+ spending_proposals_info: Participate at http://url.consul
+ spending_proposals_note: Participatory budget will be assigned to the most voted budget investment.
budget_investments_info: Participate at http://url.consul
budget_investments_note: Participatory budget will be assigned to the most voted budget investment.
print_info: Print this info
@@ -83,8 +85,8 @@ en:
unverified_user: User is not verified
create: Create budget investment
filters:
+ heading: Concepto
unfeasible: Unfeasible investment
- by_geozone: "Investment with scope: %{geozone}"
print:
print_button: Print
search_results:
diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml
index fe3d08697..f4ada5c9e 100644
--- a/config/locales/management.es.yml
+++ b/config/locales/management.es.yml
@@ -50,6 +50,9 @@ es:
create_spending_proposal: Crear propuesta de inversión
print_spending_proposals: Imprimir propts. de inversión
support_spending_proposals: Apoyar propts. de inversión
+ create_budget_investment: Crear proyectos de inversión
+ print_budget_investments: Imprimir proyectos de inversión
+ support_budget_investments: Apoyar proyectos de inversión
users: Usuarios
edit_user_accounts: Editar cuenta de usuario
user_invites: Invitaciones para usuarios
@@ -64,6 +67,8 @@ es:
proposals_title: 'Propuestas:'
spending_proposals_info: Participa en http://url.consul
spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas.
+ budget_investments_info: Participa en http://url.consul
+ budget_investments_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas.
print_info: Imprimir esta información
proposals:
alert:
@@ -71,6 +76,22 @@ es:
create_proposal: Crear propuesta
print:
print_button: Imprimir
+ budgets:
+ create_new_investment: Crear nuevo proyecto
+ print_investments: Imprimir proyectos
+ support_investments: Apoyar proyectos
+ budget_investments:
+ alert:
+ unverified_user: Usuario no verificado
+ create: Crear nuevo proyecto
+ filters:
+ heading: Concepto
+ unfeasible: Proyectos no factibles
+ print:
+ print_button: Imprimir
+ search_results:
+ one: " contiene el término '%{search_term}'"
+ other: " contienen el término '%{search_term}'"
spending_proposals:
alert:
unverified_user: Este usuario no está verificado
@@ -106,4 +127,4 @@ es:
title: Invitaciones para usuarios
create:
success_html: Se han enviado
%{count} invitaciones.
- title: Invitaciones para usuarios
\ No newline at end of file
+ title: Invitaciones para usuarios