diff --git a/app/models/budget/investment/exporter.rb b/app/models/budget/investment/exporter.rb index c7e4ce461..be3c5f2ac 100644 --- a/app/models/budget/investment/exporter.rb +++ b/app/models/budget/investment/exporter.rb @@ -58,6 +58,10 @@ class Budget::Investment::Exporter def price(investment) price_string = "admin.budget_investments.index.feasibility.#{investment.feasibility}" - I18n.t(price_string, price: investment.formatted_price) + if investment.feasible? + "#{I18n.t(price_string)} (#{investment.formatted_price})" + else + I18n.t(price_string) + end end end diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb index 1bae41ee1..d17d85ea1 100644 --- a/app/views/admin/budget_investments/_investments.html.erb +++ b/app/views/admin/budget_investments/_investments.html.erb @@ -36,6 +36,7 @@ <%= t("admin.budget_investments.index.list.geozone") %> <%= t("admin.budget_investments.index.list.feasibility") %> + <%= t("admin.budget_investments.index.list.price") %> <%= t("admin.budget_investments.index.list.valuation_finished") %> <%= t("admin.budget_investments.index.list.visible_to_valuators") %> <%= t("admin.budget_investments.index.list.selected") %> diff --git a/app/views/admin/budget_investments/_select_investment.html.erb b/app/views/admin/budget_investments/_select_investment.html.erb index 12bb5c5c8..9ef8825cb 100644 --- a/app/views/admin/budget_investments/_select_investment.html.erb +++ b/app/views/admin/budget_investments/_select_investment.html.erb @@ -31,8 +31,10 @@ <%= investment.heading.name %> - <%= t("admin.budget_investments.index.feasibility.#{investment.feasibility}", - price: investment.formatted_price) %> + <%= t("admin.budget_investments.index.feasibility.#{investment.feasibility}") %> + + + <%= investment.formatted_price %> <%= investment.valuation_finished? ? t("shared.yes"): t("shared.no") %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 5b541991d..895de4853 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -206,7 +206,7 @@ en: no_valuators_assigned: No valuators assigned no_valuation_groups: No valuation groups assigned feasibility: - feasible: "Feasible (%{price})" + feasible: "Feasible" unfeasible: "Unfeasible" undecided: "Undecided" selected: "Selected" @@ -225,6 +225,7 @@ en: visible_to_valuators: Show to valuators author_username: Author username incompatible: Incompatible + price: Price cannot_calculate_winners: The budget has to stay on phase "Balloting projects", "Reviewing Ballots" or "Finished budget" in order to calculate winners projects see_results: "See results" show: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index a02030100..429dd6717 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -206,7 +206,7 @@ es: no_valuators_assigned: Sin evaluador no_valuation_groups: Sin grupos evaluadores feasibility: - feasible: "Viable (%{price})" + feasible: "Viable" unfeasible: "Inviable" undecided: "Sin decidir" selected: "Seleccionado" @@ -225,6 +225,7 @@ es: visible_to_valuators: Mostrar a evaluadores author_username: Usuario autor incompatible: Incompatible + price: Precio cannot_calculate_winners: El presupuesto debe estar en las fases "Votación final", "Votación finalizada" o "Resultados" para poder calcular las propuestas ganadoras see_results: "Ver resultados" show: