From 16325409840e4700826afc37a57186d669b73863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 16 Jun 2021 13:17:08 +0200 Subject: [PATCH 1/3] Remove redundant placeholders in forms Using placeholders having similar (or identical) text as already present as a label has a few issues. First, it's a distraction. Reading the same information twice is useless, requires an extra effort, and might even frustrate users. Second, if users start typing before reading the placeholder and see it disappear, they might think they're missing relevant information, delete what they typed, and read the placeholder. That will get them nowhere. Finally, we display placeholders using a text offering very low contrast against the background, so users don't think the placeholder is an actual value entered in the field. Using such low contrast makes the text hard to read, particularly for users with visual impairments. So we're removing these placeholders. This commit only deals with placeholder texts with similar (or identical) texts as the label text. There might be other places where we should replace placeholder texts with labels, but that's a different topic. --- app/views/account/show.html.erb | 8 +++---- .../legislation/draft_versions/_form.html.erb | 8 ++----- .../legislation/processes/_form.html.erb | 6 +---- .../legislation/questions/_form.html.erb | 3 +-- app/views/debates/_form.html.erb | 1 - app/views/devise/confirmations/new.html.erb | 2 +- app/views/devise/passwords/new.html.erb | 2 +- app/views/devise/sessions/new.html.erb | 4 ++-- app/views/links/_link_fields.html.erb | 2 +- .../management/user_invites/new.html.erb | 1 - app/views/management/users/new.html.erb | 6 ++--- app/views/officing/residence/new.html.erb | 1 - .../organizations/registrations/new.html.erb | 13 +++++------ .../users/registrations/delete_form.html.erb | 1 - app/views/users/registrations/edit.html.erb | 8 ++----- .../registrations/finish_signup.html.erb | 4 ++-- app/views/users/registrations/new.html.erb | 11 ++++------ app/views/verification/sms/new.html.erb | 1 - config/locales/en/admin.yml | 7 ------ config/locales/en/devise_views.yml | 13 ----------- config/locales/en/general.yml | 6 ----- config/locales/en/management.yml | 1 - config/locales/en/officing.yml | 1 - config/locales/en/verification.yml | 1 - config/locales/es/admin.yml | 7 ------ config/locales/es/devise_views.yml | 13 ----------- config/locales/es/general.yml | 6 ----- config/locales/es/management.yml | 1 - config/locales/es/officing.yml | 1 - config/locales/es/verification.yml | 1 - .../information_texts_spec.rb | 22 +++++++++---------- 31 files changed, 38 insertions(+), 124 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 80cbe0029..3976c1480 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -21,13 +21,13 @@
<% if @account.organization? %> <%= f.fields_for :organization do |fo| %> - <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("account.show.organization_name_label") %> - <%= fo.text_field :responsible_name, autofocus: true, maxlength: Organization.responsible_name_max_length, placeholder: t("account.show.organization_responsible_name_placeholder") %> + <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length %> + <%= fo.text_field :responsible_name, autofocus: true, maxlength: Organization.responsible_name_max_length %> <% end %> - <%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %> + <%= f.text_field :phone_number %> <% else %> - <%= f.text_field :username, maxlength: User.username_max_length, placeholder: t("account.show.username_label") %> + <%= f.text_field :username, maxlength: User.username_max_length %> <% end %>
diff --git a/app/views/admin/legislation/draft_versions/_form.html.erb b/app/views/admin/legislation/draft_versions/_form.html.erb index 9298990cd..3c3fb1d1f 100644 --- a/app/views/admin/legislation/draft_versions/_form.html.erb +++ b/app/views/admin/legislation/draft_versions/_form.html.erb @@ -14,8 +14,7 @@
- <%= translations_form.text_field :title, - placeholder: t("admin.legislation.draft_versions.form.title_placeholder") %> + <%= translations_form.text_field :title %>
@@ -51,10 +50,7 @@
- <%= translations_form.text_area :body, - label: false, - rows: 10, - placeholder: t("admin.legislation.draft_versions.form.body_placeholder") %> + <%= translations_form.text_area :body, label: false, rows: 10 %>
diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index b5ad0b23a..1ecfec53d 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -163,28 +163,24 @@
<%= f.translatable_fields do |translations_form| %>
- <%= translations_form.text_field :title, - placeholder: t("admin.legislation.processes.form.title_placeholder") %> + <%= translations_form.text_field :title %>
<%= translations_form.text_area :summary, rows: 2, - placeholder: t("admin.legislation.processes.form.summary_placeholder"), hint: t("admin.legislation.processes.form.use_markdown") %>
<%= translations_form.text_area :description, rows: 5, - placeholder: t("admin.legislation.processes.form.description_placeholder"), hint: t("admin.legislation.processes.form.use_markdown") %>
<%= translations_form.text_area :additional_info, rows: 10, - placeholder: t("admin.legislation.processes.form.additional_info_placeholder"), hint: t("admin.legislation.processes.form.use_markdown") %>
<% end %> diff --git a/app/views/admin/legislation/questions/_form.html.erb b/app/views/admin/legislation/questions/_form.html.erb index 45c9268d6..e5338389b 100644 --- a/app/views/admin/legislation/questions/_form.html.erb +++ b/app/views/admin/legislation/questions/_form.html.erb @@ -7,8 +7,7 @@
<%= f.translatable_fields do |translations_form| %>
- <%= translations_form.text_area :title, rows: 5, - placeholder: t("admin.legislation.questions.form.title_placeholder") %> + <%= translations_form.text_area :title, rows: 5 %>
<% end %>
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index d190a5191..76719da4c 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -9,7 +9,6 @@
<%= translations_form.text_field :title, maxlength: Debate.title_max_length, - placeholder: t("debates.form.debate_title"), data: suggest_data(@debate) %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 0cbd65a22..848ae81be 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -6,7 +6,7 @@
- <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.new.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> + <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> <% if @requires_password %>

<%= f.password_field :password %>

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 0de3dcb27..ad52f1f96 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -5,7 +5,7 @@
- <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> + <%= f.email_field :email, autofocus: true %>
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button expanded" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 85ae3d320..0ed59c5ca 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -11,11 +11,11 @@ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.text_field :login, autofocus: true, placeholder: t("devise_views.sessions.new.login_label") %> + <%= f.text_field :login, autofocus: true %>
- <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> + <%= f.password_field :password, autocomplete: "off" %> <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right" %>
diff --git a/app/views/links/_link_fields.html.erb b/app/views/links/_link_fields.html.erb index ffdd1e7c0..eec22ac5f 100644 --- a/app/views/links/_link_fields.html.erb +++ b/app/views/links/_link_fields.html.erb @@ -1,6 +1,6 @@
- <%= f.text_field :label, placeholder: t("links.link_fields.label_placeholder") %> + <%= f.text_field :label %> <%= f.text_field :url, placeholder: t("links.link_fields.url_placeholder") %> diff --git a/app/views/management/user_invites/new.html.erb b/app/views/management/user_invites/new.html.erb index 5a696ec11..59256c130 100644 --- a/app/views/management/user_invites/new.html.erb +++ b/app/views/management/user_invites/new.html.erb @@ -4,7 +4,6 @@

<%= t("management.user_invites.new.info") %>

<%= text_area_tag "emails", nil, rows: 5, - placeholder: t("management.user_invites.new.info"), aria: { describedby: "emails-help-text" } %>
" class="button expanded"> diff --git a/app/views/management/users/new.html.erb b/app/views/management/users/new.html.erb index 8c8b4c5a4..cc62812be 100644 --- a/app/views/management/users/new.html.erb +++ b/app/views/management/users/new.html.erb @@ -7,11 +7,9 @@ <%= f.hidden_field :document_type %> <%= f.hidden_field :document_number %> <%= f.text_field :username, - label: t("management.username_label"), - placeholder: t("management.username_label") %> + label: t("management.username_label") %> <%= f.text_field :email, - label: t("management.users.email_optional_label"), - placeholder: t("management.email_label") %> + label: t("management.users.email_optional_label") %>
<%= f.date_select :date_of_birth, prompt: true, diff --git a/app/views/officing/residence/new.html.erb b/app/views/officing/residence/new.html.erb index 93969a67f..93c510b14 100644 --- a/app/views/officing/residence/new.html.erb +++ b/app/views/officing/residence/new.html.erb @@ -9,7 +9,6 @@ <%= f.select :document_type, document_types, prompt: "" %> <%= f.text_field :document_number, - placeholder: t("officing.residence.new.document_number"), autocomplete: "off" %>
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb index ce0d4a025..e209c0e90 100644 --- a/app/views/organizations/registrations/new.html.erb +++ b/app/views/organizations/registrations/new.html.erb @@ -7,25 +7,22 @@
<%= f.fields_for :organization do |fo| %> - <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %> + <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length %> <%= fo.text_field :responsible_name, - placeholder: t("devise_views.organizations.registrations.new.responsible_name_label"), maxlength: Organization.responsible_name_max_length, hint: t("devise_views.organizations.registrations.new.responsible_name_note") %> <% end %> - <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %> + <%= f.email_field :email %> - <%= f.text_field :phone_number, placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %> + <%= f.text_field :phone_number %> <%= f.invisible_captcha :address %> - <%= f.password_field :password, autocomplete: "off", - placeholder: t("devise_views.organizations.registrations.new.password_label") %> + <%= f.password_field :password, autocomplete: "off" %> <%= f.password_field :password_confirmation, autocomplete: "off", - label: t("devise_views.organizations.registrations.new.password_confirmation_label"), - placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %> + label: t("devise_views.organizations.registrations.new.password_confirmation_label") %> <%= f.check_box :terms_of_service, title: t("devise_views.users.registrations.new.terms_title"), diff --git a/app/views/users/registrations/delete_form.html.erb b/app/views/users/registrations/delete_form.html.erb index 0da21e44e..4880f1d5c 100644 --- a/app/views/users/registrations/delete_form.html.erb +++ b/app/views/users/registrations/delete_form.html.erb @@ -16,7 +16,6 @@ <%= f.text_field :erase_reason, autofocus: true, - placeholder: t("devise_views.users.registrations.delete_form.erase_reason_label"), label: t("devise_views.users.registrations.delete_form.erase_reason_label") %> <%= f.submit t("devise_views.users.registrations.delete_form.submit"), class: "button alert expanded" %> diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index eee748ec5..28bff0014 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -8,8 +8,7 @@
<%= f.email_field :email, label: t("devise_views.users.registrations.edit.email_label"), - autofocus: true, - placeholder: t("devise_views.users.registrations.edit.email_label") %> + autofocus: true %>
@@ -22,22 +21,19 @@ <%= f.password_field :password, autocomplete: "off", label: t("devise_views.users.registrations.edit.password_label"), - placeholder: t("devise_views.users.registrations.edit.password_label"), hint: t("devise_views.users.registrations.edit.leave_blank") %>
<%= f.password_field :password_confirmation, label: t("devise_views.users.registrations.edit.password_confirmation_label"), - autocomplete: "off", - placeholder: t("devise_views.users.registrations.edit.password_confirmation_label") %> + autocomplete: "off" %>
<%= f.password_field :current_password, label: t("devise_views.users.registrations.edit.current_password_label"), autocomplete: "off", - placeholder: t("devise_views.users.registrations.edit.current_password_label"), hint: t("devise_views.users.registrations.edit.need_current") %>
diff --git a/app/views/users/registrations/finish_signup.html.erb b/app/views/users/registrations/finish_signup.html.erb index 264372e32..11bcca2f8 100644 --- a/app/views/users/registrations/finish_signup.html.erb +++ b/app/views/users/registrations/finish_signup.html.erb @@ -8,13 +8,13 @@
<% if current_user.errors.include? :username %> - <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label") %> + <%= f.text_field :username %> <% else %> <%= f.hidden_field :username %> <% end %> <% if current_user.errors.include? :email %> - <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %> + <%= f.email_field :email %> <% else %> <%= f.hidden_field :email %> <% end %> diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index 888acbac6..485f39b8d 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -18,22 +18,19 @@ <%= f.hidden_field :locale, value: I18n.locale %> <%= f.text_field :username, autofocus: true, maxlength: User.username_max_length, - placeholder: t("devise_views.users.registrations.new.username_label"), hint: t("devise_views.users.registrations.new.username_note") %> <%= f.invisible_captcha :address %> - <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %> + <%= f.email_field :email %> - <%= f.password_field :password, autocomplete: "off", - placeholder: t("devise_views.users.registrations.new.password_label") %> + <%= f.password_field :password, autocomplete: "off" %> <%= f.password_field :password_confirmation, autocomplete: "off", - label: t("devise_views.users.registrations.new.password_confirmation_label"), - placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %> + label: t("devise_views.users.registrations.new.password_confirmation_label") %> <% if resource.use_redeemable_code %> - <%= f.text_field :redeemable_code, placeholder: t("devise_views.users.registrations.new.redeemable_code") %> + <%= f.text_field :redeemable_code %> <% end %> <%= f.check_box :terms_of_service, diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb index 93d4cb531..b11255dc4 100644 --- a/app/views/verification/sms/new.html.erb +++ b/app/views/verification/sms/new.html.erb @@ -30,7 +30,6 @@ <%= sanitize(t("verification.sms.new.phone_format")) %>

<%= t("verification.sms.new.phone_note") %>

<%= f.text_field :phone, label: false, - placeholder: t("verification.sms.new.phone_placeholder"), aria: { describedby: "phone-help-text" } %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 647ad90fd..564ef35dc 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -571,10 +571,6 @@ en: allegations_phase: Comments phase proposals_phase: Proposals phase use_markdown: Use Markdown to format the text - title_placeholder: The title of the process - summary_placeholder: Short summary of the description - description_placeholder: Add a description of the process - additional_info_placeholder: Add an additional information you consider useful homepage_description: Here you can explain the content of the process banner_title: Header colors index: @@ -647,9 +643,7 @@ en: status: draft: You can preview as admin, no one else can see it published: Visible for everybody - title_placeholder: Write the title of the draft version changelog_placeholder: Add the main changes from the previous version - body_placeholder: Write down the draft text index: title: Draft versions create: Create version @@ -680,7 +674,6 @@ en: submit_button: Save changes form: add_option: Add option - title_placeholder: Add question value_placeholder: Add a closed answer question_options: "Possible answers (optional, by default open answers)" index: diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml index d814dc55b..7e184e028 100644 --- a/config/locales/en/devise_views.yml +++ b/config/locales/en/devise_views.yml @@ -2,7 +2,6 @@ en: devise_views: confirmations: new: - email_label: Email submit: Re-send instructions title: Re-send confirmation instructions show: @@ -39,12 +38,7 @@ en: organizations: registrations: new: - email_label: Email - organization_name_label: Name of organisation password_confirmation_label: Confirm password - password_label: Password - phone_number_label: Phone number - responsible_name_label: Full name of the person responsible for the collective responsible_name_note: This would be the person representing the association/collective in whose name the proposals are presented submit: Register title: Register as an organisation or collective @@ -62,13 +56,10 @@ en: password_label: New password title: Change your password new: - email_label: Email send_submit: Send instructions title: Forgotten password? sessions: new: - login_label: Email or username - password_label: Password remember_me: Remember me submit: Enter title: Sign in @@ -106,12 +97,9 @@ en: waiting_for: "Awaiting confirmation of:" new: cancel: Cancel login - email_label: Email organization_signup: Do you represent an organisation or collective? %{signup_link} organization_signup_link: Sign up here password_confirmation_label: Confirm password - password_label: Password - redeemable_code: Verification code received via email (optional) submit: Register terms: By registering you accept the %{terms} terms_link: terms and conditions of use @@ -119,7 +107,6 @@ en: title: Register username_is_available: Username available username_is_not_available: Username already in use - username_label: Username username_note: Name that appears next to your posts success: back_to_index: I understand; go back to main page diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 969704fa3..b7f73cbe4 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -5,10 +5,7 @@ en: erase_account_link: Erase my account finish_verification: Complete verification notifications: Notifications - organization_name_label: Name of organization - organization_responsible_name_placeholder: Representative of the organization/collective personal: Personal details - phone_number_label: Phone number public_interests_my_title_list: Tags of elements you follow public_interests_user_title_list: Tags of elements this user follows save_changes_submit: Save changes @@ -22,7 +19,6 @@ en: user_permission_verify: To perform all the actions verify your account. user_permission_verify_info: "* Only for users on Census." user_permission_votes: Participate on final voting - username_label: Username verified_account: Account verified verify_my_account: Verify my account application: @@ -93,7 +89,6 @@ en: submit_button: Save changes show_link: View debate form: - debate_title: Debate title tags_instructions: Tag this debate. tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" index: @@ -958,7 +953,6 @@ en: note: Add the links that are of interest add_new_link: Add new link link_fields: - label_placeholder: Link title url_placeholder: Link address communities: show: diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index bca638b98..3cc3df8f5 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -43,7 +43,6 @@ en: title: User management under_age: "You don't have the required age to verify your account." verify: Verify - email_label: Email date_of_birth: Date of birth email_verifications: already_verified: This user account is already verified. diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml index dd1d78a1b..066c137ae 100644 --- a/config/locales/en/officing.yml +++ b/config/locales/en/officing.yml @@ -69,7 +69,6 @@ en: not_allowed: "You don't have officing shifts today" new: title: Validate document - document_number: "Document number (including letters)" submit: Validate document error_verifying_census: "The Census was unable to verify this document." form_errors: prevented the verification of this document diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index 22057d67d..cd0201d63 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -75,7 +75,6 @@ en: phone: Enter your mobile phone number to receive the code phone_format: "(Example: 612345678 or +34612345678)" phone_note: We only use your phone to send you a code, never to contact you. - phone_placeholder: "Example: 612345678 or +34612345678" submit_button: Send title: Send confirmation code update: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 534dc9529..930343b95 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -571,10 +571,6 @@ es: allegations_phase: Fase de comentarios proposals_phase: Fase de propuestas use_markdown: Usa Markdown para formatear el texto - title_placeholder: Escribe el título del proceso - summary_placeholder: Resumen corto de la descripción - description_placeholder: Añade una descripción del proceso - additional_info_placeholder: Añade cualquier información adicional que pueda ser de interés homepage_description: Aquí puedes explicar el contenido del proceso banner_title: Colores del encabezado index: @@ -646,9 +642,7 @@ es: status: draft: Podrás previsualizarlo como logueado, nadie más lo podrá ver published: Será visible para todo el mundo - title_placeholder: Escribe el título de esta versión del borrador changelog_placeholder: Describe cualquier cambio relevante con la versión anterior - body_placeholder: Escribe el texto del borrador index: title: Versiones del borrador create: Crear versión @@ -679,7 +673,6 @@ es: submit_button: Guardar cambios form: add_option: Añadir respuesta cerrada - title_placeholder: Escribe un título a la pregunta value_placeholder: Escribe una respuesta cerrada question_options: "Posibles respuestas (opcional, por defecto respuestas abiertas)" index: diff --git a/config/locales/es/devise_views.yml b/config/locales/es/devise_views.yml index 21c83d8d3..4b63ca652 100644 --- a/config/locales/es/devise_views.yml +++ b/config/locales/es/devise_views.yml @@ -2,7 +2,6 @@ es: devise_views: confirmations: new: - email_label: Email submit: Reenviar instrucciones title: Reenviar instrucciones de confirmación show: @@ -39,12 +38,7 @@ es: organizations: registrations: new: - email_label: Email - organization_name_label: Nombre de la organización password_confirmation_label: Repite la contraseña anterior - password_label: Contraseña que utilizarás para acceder a este sitio web - phone_number_label: Teléfono - responsible_name_label: Nombre y apellidos de la persona responsable del colectivo responsible_name_note: Será la persona representante de la asociación/colectivo en cuyo nombre se presenten las propuestas submit: Registrarse title: Registrarse como organización / colectivo @@ -62,13 +56,10 @@ es: password_label: Contraseña nueva title: Cambia tu contraseña new: - email_label: Email send_submit: Recibir instrucciones title: '¿Has olvidado tu contraseña?' sessions: new: - login_label: Email o nombre de usuario - password_label: Contraseña que utilizarás para acceder a este sitio web remember_me: Recordarme submit: Entrar title: Iniciar sesión @@ -106,12 +97,9 @@ es: waiting_for: "Esperando confirmación de:" new: cancel: Cancelar login - email_label: Tu correo electrónico organization_signup: '¿Representas a una organización / colectivo? %{signup_link}' organization_signup_link: Regístrate aquí password_confirmation_label: Repite la contraseña anterior - password_label: Contraseña que utilizarás para acceder a este sitio web - redeemable_code: Tu código de verificación (si has recibido una carta con él) submit: Registrarse terms: Al registrarte aceptas las %{terms} terms_link: condiciones de uso @@ -119,7 +107,6 @@ es: title: Registrarse username_is_available: Nombre de usuario disponible username_is_not_available: Nombre de usuario ya existente - username_label: Nombre de usuario username_note: Nombre público que aparecerá en tus publicaciones success: back_to_index: Entendido, volver a la página principal diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 9bb9618e0..76f09c03a 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -5,10 +5,7 @@ es: erase_account_link: Darme de baja finish_verification: Finalizar verificación notifications: Notificaciones - organization_name_label: Nombre de la organización - organization_responsible_name_placeholder: Representante de la asociación/colectivo personal: Datos personales - phone_number_label: Teléfono public_interests_my_title_list: Etiquetas de los elementos que sigues public_interests_user_title_list: Etiquetas de los elementos que sigue este usuario save_changes_submit: Guardar cambios @@ -22,7 +19,6 @@ es: user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. user_permission_verify_info: "* Sólo usuarios empadronados." user_permission_votes: Participar en las votaciones finales* - username_label: Nombre de usuario verified_account: Cuenta verificada verify_my_account: Verificar mi cuenta application: @@ -93,7 +89,6 @@ es: submit_button: Guardar cambios show_link: Ver debate form: - debate_title: Título del debate tags_instructions: Etiqueta este debate. tags_placeholder: "Escribe las etiquetas que desees separadas por coma (',')" index: @@ -958,7 +953,6 @@ es: note: Añade los enlaces que sean de interés. add_new_link: Añadir nuevo enlace link_fields: - label_placeholder: Título del enlace url_placeholder: Dirección del enlace communities: show: diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index fddaa42ee..cd25049e4 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -43,7 +43,6 @@ es: title: Gestión de usuarios under_age: "No tienes edad suficiente para verificar tu cuenta." verify: Verificar usuario - email_label: Email date_of_birth: Fecha de nacimiento email_verifications: already_verified: Esta cuenta de usuario ya está verificada. diff --git a/config/locales/es/officing.yml b/config/locales/es/officing.yml index 5586c6e62..f668ce8a2 100644 --- a/config/locales/es/officing.yml +++ b/config/locales/es/officing.yml @@ -69,7 +69,6 @@ es: not_allowed: "Hoy no tienes turno de presidente de mesa" new: title: Validar documento - document_number: "Número de documento (incluida letra)" submit: Validar documento error_verifying_census: "El Padrón no pudo verificar este documento." form_errors: evitaron verificar este documento diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index cce8722de..55123724d 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -75,7 +75,6 @@ es: phone: Introduce tu teléfono móvil para recibir el código phone_format: "(Ejemplo: 612345678 ó +34612345678)" phone_note: Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos. - phone_placeholder: "Ejemplo: 612345678 ó +34612345678" submit_button: Enviar title: SMS de confirmación update: diff --git a/spec/system/admin/site_customization/information_texts_spec.rb b/spec/system/admin/site_customization/information_texts_spec.rb index ddd27f4e6..a887ffca4 100644 --- a/spec/system/admin/site_customization/information_texts_spec.rb +++ b/spec/system/admin/site_customization/information_texts_spec.rb @@ -91,13 +91,11 @@ describe "Admin custom information texts", :admin do end scenario "Remove a translation" do - first_key = "debates.form.debate_title" - debate_title = create(:i18n_content, key: first_key, - value_en: "Custom debate title", - value_es: "Título personalizado de debate") + featured = create(:i18n_content, key: "debates.index.featured_debates", + value_en: "Custom featured", + value_es: "Destacar personalizado") - second_key = "debates.new.start_new" - page_title = create(:i18n_content, key: second_key, + page_title = create(:i18n_content, key: "debates.new.start_new", value_en: "Start a new debate", value_es: "Empezar un debate") @@ -113,15 +111,15 @@ describe "Admin custom information texts", :admin do select "English", from: :select_language expect(page).to have_content "Start a new debate" - expect(page).to have_content "Custom debate title" + expect(page).to have_content "Custom featured" - debate_title.reload + featured.reload page_title.reload - expect(page_title.value_es).to be(nil) - expect(debate_title.value_es).to be(nil) - expect(page_title.value_en).to eq("Start a new debate") - expect(debate_title.value_en).to eq("Custom debate title") + expect(page_title.value_es).to be nil + expect(featured.value_es).to be nil + expect(page_title.value_en).to eq "Start a new debate" + expect(featured.value_en).to eq "Custom featured" end end end From 24d758ee649e1aa98f9f02d1fd4af662741cd8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 16 Jun 2021 15:18:44 +0200 Subject: [PATCH 2/3] Use a label in the email verification email field We were using a paragraph before the field, and then a field with no label and a redundant placeholder. This causes accessibility issues for screen reader users, who will not hear the label being announced when entering the field, and to users who click on the label expecting it to automatically focus on its related field (which is the standard browser behavior). --- app/views/management/email_verifications/new.html.erb | 4 +--- config/locales/en/management.yml | 1 - config/locales/es/management.yml | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/management/email_verifications/new.html.erb b/app/views/management/email_verifications/new.html.erb index 6dea2f0f7..5245528e1 100644 --- a/app/views/management/email_verifications/new.html.erb +++ b/app/views/management/email_verifications/new.html.erb @@ -6,14 +6,12 @@
  • <%= t("management.email_verifications.if_existing_account") %> -

    <%= t("management.email_verifications.introduce_email") %>

    - <%= form_for @email_verification, as: :email_verification, url: management_email_verifications_path do |f| %> <%= f.hidden_field :document_type %> <%= f.hidden_field :document_number %> - <%= f.text_field :email, label: false, placeholder: t("management.email_verifications.email_placeholder") %> + <%= f.text_field :email, label: t("management.email_verifications.introduce_email") %> <%= f.submit t("management.email_verifications.send_email"), class: "button hollow" %> <% end %> diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index 3cc3df8f5..a66790849 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -49,7 +49,6 @@ en: choose_options: "Please choose one of the following options:" document_found_in_census: This document was found in the census, but it has no user account associated to it. document_mismatch: "This email belongs to a user which already has an associated id: %{document_number}(%{document_type})" - email_placeholder: Write the email this person used to create his or her account email_sent_instructions: In order to completely verify this user, it is necessary that the user clicks on a link which we have sent to the email address above. This step is needed in order to confirm that the address belongs to him. if_existing_account: If the person has already a user account created in the website, if_no_existing_account: If this person has not created an account yet diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index cd25049e4..e0e018d90 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -49,7 +49,6 @@ es: choose_options: "Elige una de las opciones siguientes:" document_found_in_census: Este documento está en el registro del padrón municipal, pero todavía no tiene una cuenta de usuario asociada. document_mismatch: "Ese email corresponde a un usuario que ya tiene asociado el documento %{document_number}(%{document_type})" - email_placeholder: Introduce el email de registro email_sent_instructions: Para terminar de verificar esta cuenta es necesario que haga clic en el enlace que le hemos enviado a la dirección de correo que figura arriba. Este paso es necesario para confirmar que dicha cuenta de usuario es suya. if_existing_account: Si la persona ya ha creado una cuenta de usuario en la web if_no_existing_account: Si la persona todavía no ha creado una cuenta de usuario en la web From 42c9645fb79066da1e573691f62d35e4c09cf90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 16 Jun 2021 15:36:45 +0200 Subject: [PATCH 3/3] Improve label in dashboard actions link form We were using a placeholder to indicate content which should be part of a label. It might be better to actually use "Link address" as a label instead of "URL". I'm using "URL" because it's used in other places in the admin section. --- app/views/links/_link_fields.html.erb | 3 +-- config/locales/en/activerecord.yml | 2 +- config/locales/en/general.yml | 2 -- config/locales/es/activerecord.yml | 2 +- config/locales/es/general.yml | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/views/links/_link_fields.html.erb b/app/views/links/_link_fields.html.erb index eec22ac5f..498b5ca2b 100644 --- a/app/views/links/_link_fields.html.erb +++ b/app/views/links/_link_fields.html.erb @@ -1,8 +1,7 @@
    <%= f.text_field :label %> - - <%= f.text_field :url, placeholder: t("links.link_fields.url_placeholder") %> + <%= f.text_field :url %>
    <%= render_destroy_element_link(f, f.object) %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 5b12917fd..c2057e07b 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -500,7 +500,7 @@ en: user: Executed by link: label: Title - url: Link + url: URL valuator: description: Description valuator_group_id: Valuator group diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b7f73cbe4..47616b616 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -952,8 +952,6 @@ en: title: Links note: Add the links that are of interest add_new_link: Add new link - link_fields: - url_placeholder: Link address communities: show: surveys: Surveys diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 43bd93700..a6454e6e3 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -500,7 +500,7 @@ es: user: Ejecutado por link: label: Título - url: Enlace + url: URL valuator: description: Descripción valuator_group_id: Grupo de evaluación diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 76f09c03a..903e96d07 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -952,8 +952,6 @@ es: title: Enlaces note: Añade los enlaces que sean de interés. add_new_link: Añadir nuevo enlace - link_fields: - url_placeholder: Dirección del enlace communities: show: surveys: Encuestas