diff --git a/app/views/management/document_verifications/index.html.erb b/app/views/management/document_verifications/index.html.erb index ecb6b95f4..4c81f65ef 100644 --- a/app/views/management/document_verifications/index.html.erb +++ b/app/views/management/document_verifications/index.html.erb @@ -9,14 +9,10 @@ <%= f.select(:document_type, [[humanize_document_type("1"), 1], [humanize_document_type("2"), 2], - [humanize_document_type("3"), 3]], - label: t("management.document_type_label")) %> + [humanize_document_type("3"), 3]]) %>
- <%= f.text_field :document_number, - placeholder: t("management.document_number"), - label: t("management.document_number") - %> + <%= f.text_field :document_number %>
<% if Setting.force_presence_date_of_birth? %> diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb index d9b99bec4..d8bcb0879 100644 --- a/app/views/verification/letter/edit.html.erb +++ b/app/views/verification/letter/edit.html.erb @@ -12,8 +12,8 @@
<%= form_for @letter, url: letter_path, method: :patch do |f| %> - <%= f.text_field :email, label: t("pages.verify.email"), placeholder: t("pages.verify.email") %> - <%= f.password_field :password, label: t("pages.verify.password"), placeholder: t("pages.verify.password") %> + <%= f.text_field :email %> + <%= f.password_field :password %>

@@ -23,7 +23,7 @@ <%= t("pages.verify.info_code") %>

- <%= f.text_field :verification_code, label: t("pages.verify.code"), placeholder: t("pages.verify.code") %> + <%= f.text_field :verification_code %> <%= f.submit(class: "button success expanded", value: t("pages.verify.submit")) %> <% end %> diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb index 9c9adb322..cb77a4f46 100644 --- a/app/views/verification/residence/new.html.erb +++ b/app/views/verification/residence/new.html.erb @@ -39,8 +39,7 @@
- <%= f.select :document_type, document_types, prompt: "", - label: t("verification.residence.new.document_type_label") %> + <%= f.select :document_type, document_types, prompt: "" %>
@@ -66,13 +65,11 @@
<%= f.date_select :date_of_birth, prompt: true, - start_year: 1900, end_year: minimum_required_age.years.ago.year, - label: t("verification.residence.new.date_of_birth") %> + start_year: 1900, end_year: minimum_required_age.years.ago.year %>
<%= f.text_field :postal_code, - label: t("verification.residence.new.postal_code"), hint: t("verification.residence.new.postal_code_note") %>
diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb index af9c70e1f..4cb0e11ee 100644 --- a/app/views/verification/sms/edit.html.erb +++ b/app/views/verification/sms/edit.html.erb @@ -33,7 +33,7 @@ <% end %>
- <%= f.text_field :confirmation_code, label: t("verification.sms.edit.confirmation_code") %> + <%= f.text_field :confirmation_code %>
<%= f.submit t("verification.sms.edit.submit_button"), class: "button success" %> diff --git a/config/locales/en/activemodel.yml b/config/locales/en/activemodel.yml index 47b239115..c34d58c9f 100644 --- a/config/locales/en/activemodel.yml +++ b/config/locales/en/activemodel.yml @@ -19,6 +19,19 @@ en: confirmation_code: "Confirmation code" email: recipient: "Email" + verification/letter: + email: "Email" + password: "Password" + verification_code: "Code you received in letter" + verification/management/document: + document_type: "Document type:" + document_number: "Document number" + verification/residence: + date_of_birth: "Date of birth" + document_type: "Document type" + postal_code: "Postcode" + verification/sms: + confirmation_code: "Enter the code you received on your mobile" officing/residence: document_type: "Document type" document_number: "Document number (including letters)" diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index 97b438d1e..4fbb86e0e 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -32,8 +32,6 @@ en: index: title: Management info: Here you can manage users through all actions listed in the left menu. - document_number: Document number - document_type_label: Document type document_verifications: already_verified: This user account is already verified. has_no_account_html: In order to create an account, go to %{link} and click in "Register" in the upper-left part of the screen. diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index d612f5b72..4cc92db43 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -143,10 +143,7 @@ en: titles: help: "What is %{org}? - Citizen participation" verify: - code: Code you received in letter - email: Email info: "To verify your account introduce your access data:" info_code: "Now introduce the code you received in letter:" - password: Password submit: Verify my account title: Verify your account diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index a93e6d507..af82308e0 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -47,7 +47,6 @@ en: new: accept_terms_text: I accept %{terms_url} of the Census accept_terms_text_title: I accept the terms and conditions of access of the Census - date_of_birth: Date of birth document_number: Document number document_number_help_title: Help document_number_help_text_html: "DNI: 12345678A
Passport: AAA000001
Residence card: X1234567P" @@ -55,12 +54,10 @@ en: passport: Passport residence_card: Residence card spanish_id: DNI - document_type_label: Document type error_not_allowed_age: You don't have the required age to participate error_not_allowed_postal_code: In order to be verified, you must be registered. error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one Citizen Support Office. form_errors: prevented the verification of your residence - postal_code: Postcode postal_code_note: To verify your account you must be registered terms: the terms and conditions of access title: Verify residence @@ -70,7 +67,6 @@ en: flash: success: Enter the confirmation code sent to you by text message edit: - confirmation_code: Enter the code you received on your mobile resend_sms_link: Click here to send it again resend_sms_text: Didn't get a text with your confirmation code? submit_button: Send diff --git a/config/locales/es/activemodel.yml b/config/locales/es/activemodel.yml index 155e61cc0..e303303d7 100644 --- a/config/locales/es/activemodel.yml +++ b/config/locales/es/activemodel.yml @@ -19,6 +19,19 @@ es: confirmation_code: "Código de confirmación" email: recipient: "Email" + verification/letter: + email: "Email" + password: "Contraseña" + verification_code: "Código que has recibido en tu carta" + verification/management/document: + document_type: "Tipo de documento" + document_number: "Número de documento" + verification/residence: + date_of_birth: "Fecha de nacimiento" + document_type: "Tipo de documento" + postal_code: "Código postal" + verification/sms: + confirmation_code: "Introduce el código que has recibido en tu móvil" officing/residence: document_type: "Tipo de documento" document_number: "Número de documento (incluida letra)" diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index 953e2a8a0..dc3abcaf5 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -32,8 +32,6 @@ es: index: title: Gestión info: Desde aquí puedes gestionar usuarios a través de las acciones listadas en el menú de la izquierda. - document_number: Número de documento - document_type_label: Tipo de documento document_verifications: already_verified: Esta cuenta de usuario ya está verificada. has_no_account_html: Para crear un usuario entre en %{link} y haga clic en la opción 'Registrarse' en la parte superior derecha de la pantalla. diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index f52505600..33835a1e3 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -161,10 +161,7 @@ es: titles: help: "¿Qué es %{org}? - Participación ciudadana" verify: - code: Código que has recibido en tu carta - email: Email info: "Para verificar tu cuenta introduce los datos con los que te registraste:" info_code: "Ahora introduce el código que has recibido en tu carta:" - password: Contraseña submit: Verificar mi cuenta title: Verifica tu cuenta diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index 167d273da..bd169c621 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -47,7 +47,6 @@ es: new: accept_terms_text: Acepto %{terms_url} al Padrón accept_terms_text_title: Acepto los términos de acceso al Padrón - date_of_birth: Fecha de nacimiento document_number: Número de documento document_number_help_title: Ayuda document_number_help_text_html: "DNI: 12345678A
Pasaporte: AAA000001
Tarjeta de residencia: X1234567P" @@ -55,12 +54,10 @@ es: passport: Pasaporte residence_card: Tarjeta de residencia spanish_id: DNI - document_type_label: Tipo de documento error_not_allowed_age: No tienes la edad mínima para participar error_not_allowed_postal_code: Para verificarte debes estar empadronado. error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una Oficina de Atención al Ciudadano. form_errors: evitaron verificar tu residencia - postal_code: Código postal postal_code_note: Para verificar tus datos debes estar empadronado terms: los términos de acceso title: Verificar residencia @@ -70,7 +67,6 @@ es: flash: success: Introduce el código de confirmación que te hemos enviado por mensaje de texto edit: - confirmation_code: Introduce el código que has recibido en tu móvil resend_sms_link: Solicitar un nuevo código resend_sms_text: '¿No has recibido un mensaje de texto con tu código de confirmación?' submit_button: Enviar