diff --git a/app/views/valuation/budget_investments/_dossier_form.html.erb b/app/views/valuation/budget_investments/_dossier_form.html.erb index b7fea5574..cb1230c18 100644 --- a/app/views/valuation/budget_investments/_dossier_form.html.erb +++ b/app/views/valuation/budget_investments/_dossier_form.html.erb @@ -7,22 +7,19 @@ <%= t("valuation.budget_investments.edit.feasibility") %>
- <%= f.radio_button :feasibility, "undecided", - label: t("valuation.budget_investments.edit.undefined_feasible") %> + <%= f.radio_button :feasibility, "undecided" %>
- <%= f.radio_button :feasibility, "feasible", - label: t("valuation.budget_investments.edit.feasible") %> + <%= f.radio_button :feasibility, "feasible" %>
- <%= f.radio_button :feasibility, "unfeasible", - label: t("valuation.budget_investments.edit.unfeasible") %> + <%= f.radio_button :feasibility, "unfeasible" %>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index f63161e4b..62ba0b9eb 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -153,6 +153,9 @@ en: organization_name: "If you are proposing in the name of a collective/organization, or on behalf of more people, write its name" image: "Proposal descriptive image" image_title: "Image title" + feasibility_feasible: "Feasible" + feasibility_undecided: "Undefined" + feasibility_unfeasible: "Unfeasible" budget/investment/translation: title: "Title" description: "Description" diff --git a/config/locales/en/valuation.yml b/config/locales/en/valuation.yml index 2c8c6d7c2..9153fe244 100644 --- a/config/locales/en/valuation.yml +++ b/config/locales/en/valuation.yml @@ -60,9 +60,6 @@ en: price_first_year_html: "Cost during the first year (%{currency}) (optional, data not public)" price_explanation_html: Price explanation feasibility: Feasibility - feasible: Feasible - unfeasible: Not feasible - undefined_feasible: Pending feasible_explanation_html: Feasibility explanation valuation_finished: Valuation finished valuation_finished_alert: "Are you sure you want to mark this report as completed? If you do it, it can no longer be modified." diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 87f4b19be..e7ea7d05d 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -155,6 +155,9 @@ es: organization_name: "Si estás proponiendo en nombre de una organización o colectivo, o en nombre de más gente, escribe su nombre" image: "Imagen descriptiva del proyecto de gasto" image_title: "Título de la imagen" + feasibility_feasible: "Viable" + feasibility_undecided: "Sin decidir" + feasibility_unfeasible: "Inviable" budget/investment/translation: title: "Título" description: "Descripción" diff --git a/config/locales/es/valuation.yml b/config/locales/es/valuation.yml index 15d6b7c31..bf4ff09e2 100644 --- a/config/locales/es/valuation.yml +++ b/config/locales/es/valuation.yml @@ -60,9 +60,6 @@ es: price_first_year_html: "Coste en el primer año (%{currency}) (opcional, dato no público)" price_explanation_html: Informe de coste (opcional, dato público) feasibility: Viabilidad - feasible: Viable - unfeasible: Inviable - undefined_feasible: Sin decidir feasible_explanation_html: Informe de inviabilidad (en caso de que lo sea, dato público) valuation_finished: Informe finalizado valuation_finished_alert: "¿Estás seguro/a de querer marcar este informe como completado? Una vez hecho, no se puede deshacer la acción." diff --git a/lib/consul_form_builder.rb b/lib/consul_form_builder.rb index b6064fbe2..9cf822823 100644 --- a/lib/consul_form_builder.rb +++ b/lib/consul_form_builder.rb @@ -27,6 +27,12 @@ class ConsulFormBuilder < FoundationRailsHelper::FormBuilder end end + def radio_button(attribute, tag_value, options = {}) + default_label = object.class.human_attribute_name("#{attribute}_#{tag_value}") + + super(attribute, tag_value, { label: default_label }.merge(options)) + end + private def label_with_hint(attribute, options)