diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index 29a72b5fd..7e12add07 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -10,7 +10,6 @@ <%= translations_form.text_field :title, maxlength: Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), - label: t("proposals.form.proposal_title"), data: { js_suggest_result: "js_suggest_result", js_suggest: ".js-suggest", js_url: suggest_proposals_path } %> @@ -32,8 +31,7 @@
<%= translations_form.cktext_area :description, maxlength: Proposal.description_max_length, - ckeditor: { language: I18n.locale }, - label: t("proposals.form.proposal_text") %> + ckeditor: { language: I18n.locale } %>
<% end %> diff --git a/app/views/proposals/retire_form.html.erb b/app/views/proposals/retire_form.html.erb index 704d2db3c..9a73c9782 100644 --- a/app/views/proposals/retire_form.html.erb +++ b/app/views/proposals/retire_form.html.erb @@ -23,10 +23,9 @@
<%= f.translatable_fields do |translations_form| %> -
+
<%= translations_form.text_area :retired_explanation, rows: 4, maxlength: 500, - label: t("proposals.retire_form.retired_explanation_label"), placeholder: t("proposals.retire_form.retired_explanation_placeholder") %>
<% end %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 1ae65f7a0..8e9495564 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -192,6 +192,11 @@ en: description: "Description" selected: "Mark as selected" terms_of_service: "Terms of service" + proposal/translation: + title: "Proposal title" + description: "Proposal text" + summary: "Proposal summary" + retired_explanation: "Explanation" user: login: "Email or username" email: "Email" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 595723072..74b793bfd 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -332,7 +332,6 @@ en: warning: "If you retire the proposal it would still accept supports, but will be removed from the main list and a message will be visible to all users stating that the author considers the proposal should not be supported anymore" retired_reason_label: Reason to retire the proposal retired_reason_blank: Choose an option - retired_explanation_label: Explanation retired_explanation_placeholder: Explain shortly why you think this proposal should not receive more supports submit_button: Retire proposal retire_options: diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index fb3bc3138..626796cc4 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -194,6 +194,11 @@ es: description: "Descripción" selected: "Marcar como seleccionada" terms_of_service: "Términos de servicio" + proposal/translation: + title: "Título de la propuesta" + description: "Texto desarrollado de la propuesta" + summary: "Resumen de la propuesta" + retired_explanation: "Explicación" user: login: "Email o nombre de usuario" email: "Email" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 0f69861ae..5f7e106de 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -332,7 +332,6 @@ es: warning: "Si sigues adelante tu propuesta podrá seguir recibiendo apoyos, pero dejará de ser listada en la lista principal, y aparecerá un mensaje para todos los usuarios avisándoles de que el autor considera que esta propuesta no debe seguir recogiendo apoyos." retired_reason_label: Razón por la que se retira la propuesta retired_reason_blank: Selecciona una opción - retired_explanation_label: Explicación retired_explanation_placeholder: Explica brevemente por que consideras que esta propuesta no debe recoger más apoyos submit_button: Retirar propuesta retire_options: