Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions app/views/idv/phone/new.html.slim
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
- title @view_model.title

h1.h2.my0 = t('idv.titles.session.phone')
p.mt-tiny.mb2 = t('idv.messages.phone.intro')

.alert.alert-warning.mb1
strong
= t('idv.messages.phone.alert')
ul.py1.m0.px0
li
= t('idv.messages.phone.in_your_name')
li
= t('idv.messages.phone.prepaid')
li
= t('idv.messages.phone.us_country_code')
.mt2
== t('idv.messages.phone.alert')

p = t('idv.messages.phone.same_as_2fa')
ul.py1.m0
- t('idv.messages.phone.rules').each do |msg|
li = msg

= simple_form_for(@view_model.idv_form, url: idv_phone_path,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its hard to tell in github, but is this nesting the form within the ul?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope! but the diff view does make it look like it :)

screen shot 2018-05-30 at 6 24 39 am

html: { autocomplete: 'off', method: :put, role: 'form', class: 'mt2' }) do |f|
= f.label :phone, label: t('idv.form.phone'), class: 'bold'
span.ml1
em
= t('idv.form.phone_label_aside')
= f.input :phone, required: true, input_html: { class: 'us-phone' }, label: false,
wrapper_html: { class: 'inline-block mr2' }
= f.button :submit, t('forms.buttons.continue')
wrapper_html: { class: 'mr2' }

- if FeatureManagement.enable_usps_verification?
= render 'verification_options'
- if FeatureManagement.enable_usps_verification?
= render 'verification_options'

= f.button :submit, t('forms.buttons.continue'), class: 'btn-wide mt6'

= render 'shared/cancel', link: idv_cancel_path

= render @view_model.modal_partial, view_model: @view_model
21 changes: 9 additions & 12 deletions config/locales/idv/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,17 @@ en:
unsupported_jurisdiction: Sorry, we can't verify people from this state.
unsupported_jurisdiction_sp: Please visit %{sp_name} to access your account.
form:
activate_by_mail: get a code by letter.
activate_by_mail: get a code via mail instead ›
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would consider inserting the > via CSS using :after rather than having it be part of the text string. I think it will be better for a11y, and also be more flexible if the preferred style were to change.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not opposed to it in concept, however, there is at least one other place where the guillemet is present and I was just going with the flow.

Originally, the one in English was different than Spanish and French, but per some the comment here, i changed them to be the same.

address1: Address
address2: Address (optional)
city: City
dob: Date of birth
dob_hint: 'example: 01/17/1964'
first_name: First name
last_name: Last name
no_alternate_phone_html: If you don't have another phone number, %{link}
no_alternate_phone_html: 'No phone? No problem: %{link}'
password: Password
phone: Phone Number
phone_label_aside: Mobile phone or landline
ssn_label_html: Social Security Number
state: State
state_id: ID number
Expand Down Expand Up @@ -98,15 +97,13 @@ en:
personal_key: This is your new personal key. Write it down and keep it in a
safe place. You will need it if you ever lose your password.
phone:
alert: This phone line must be
in_your_name: in your name, or a family member's name
intro: We can only send a confirmation code to a telephone number linked to
you.
alert: This phone number <strong>must be</strong>
phone_of_record: Phone of record
prepaid: not prepaid
same_as_2fa: This phone number can be the same one you used to set up your
one-time password as long as it meets the criteria above.
us_country_code: based in the United States
rules:
- in your name, or a family member's name
- not a virtual phone (such as Google Voice or Skype)
- not a pre-paid phone number
- a U.S. number
return_to_profile: "‹ Return to your login.gov profile"
return_to_sp_html: You can now log into <strong>%{sp}</strong>.
review:
Expand Down Expand Up @@ -189,7 +186,7 @@ en:
review: Review and submit
select_verification: Choose how to confirm your address
session:
phone: Get a code by telephone
phone: Enter a phone number to help verify your identity
review: Enter your login.gov password
success: We've verified the information on your state-issued ID.
sessions: Information about you
Expand Down
22 changes: 9 additions & 13 deletions config/locales/idv/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,17 @@ es:
estado.
unsupported_jurisdiction_sp: Visita %{sp_name} para acceder a tu cuenta.
form:
activate_by_mail: obtenga un código por carta.
activate_by_mail: obtener un código por correo electrónico en su lugar ›
address1: Dirección
address2: Dirección (opcional)
city: Ciudad
dob: Fecha de nacimiento
dob_hint: 'Ejemplo: 01/17/1964'
first_name: Nombre
last_name: Apellido
no_alternate_phone_html: Si no tiene otro número de teléfono, %{link}
no_alternate_phone_html: "¿Sin teléfono? No hay problema %{link}"
password: Contraseña
phone: Teléfono
phone_label_aside: Celular o teléfono fijo
ssn_label_html: Número de Seguro Social
state: Estado
state_id: Número de identificación
Expand Down Expand Up @@ -97,16 +96,13 @@ es:
personal_key: Esta es su nueva clave personal. Escríbala y guárdela en un lugar
seguro. La necesitará si pierde su contraseña.
phone:
alert: Esta línea telefónica debe
in_your_name: a su nombre o el nombre de un miembro de familia
intro: Sólo podemos enviar el código de confirmación al número de teléfono
vinculado a su identidad legal.
alert: Este número de teléfono <strong>debe ser</strong>
phone_of_record: Teléfono del registro
prepaid: no prepago
same_as_2fa: Este número de teléfono puede ser el mismo que utilizó para configurar
su contraseña de un uso único, siempre y cuando cumpla con los criterios
anteriores.
us_country_code: NOT TRANSLATED YET
rules:
- a su nombre o el nombre de un miembro de familia
- no es un teléfono virtual (como Google Voice o Skype)
- no es un número de teléfono prepago
- un número de EE. UU.
return_to_profile: NOT TRANSLATED YET
return_to_sp_html: NOT TRANSLATED YET
review:
Expand Down Expand Up @@ -190,7 +186,7 @@ es:
review: Revise y envíe
select_verification: Active su cuenta
session:
phone: Obtener un código por teléfono
phone: Ingresa un número de teléfono para ayudar a verificar tu identidad
review: Encripte sus datos verificados ingresando su contraseña.
success: Hemos verificado la información en su identificación emitida por
el estado.
Expand Down
22 changes: 9 additions & 13 deletions config/locales/idv/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,17 @@ fr:
unsupported_jurisdiction_sp: Veuillez visiter %{sp_name} pour accéder à votre
compte.
form:
activate_by_mail: obtenez un code par lettre.
activate_by_mail: obtenir un code par courrier à la place ›
address1: Adresse
address2: Adresse (optional)
city: Ville
dob: Date de naissance
dob_hint: 'exemple : 01/17/1964'
first_name: Prénom
last_name: Nom de famille
no_alternate_phone_html: Si vous n'avez pas d'autre numéro de téléphone, %{link}
no_alternate_phone_html: 'Pas de téléphone? aucun problème: %{link}'
password: Mot de passe
phone: Numéro de téléphone
phone_label_aside: Ligne mobile ou fixe
ssn_label_html: Numéro de sécurité sociale
state: État
state_id: Numéro d'identification
Expand Down Expand Up @@ -104,16 +103,13 @@ fr:
dans un endroit sécuritaire. Vous en aurez besoin si vous perdez votre mot
de passe.
phone:
alert: Cette ligne téléphonique doit être
in_your_name: en votre nom ou celui d'un membre de votre famille
intro: Le seul numéro de téléphone auquel nous pouvons envoyer un code de
confirmation est celui qui est lié à votre identité légale.
alert: Ce numéro de téléphone <strong>doit être</strong>
phone_of_record: numéro de téléphone enregistré
prepaid: et non prépayé
same_as_2fa: Ce numéro de téléphone peut être le même que celui que vous utilisez
pour configurer votre mot de passe à usage unique, tant et aussi longtemps
qu'il respecte les critères mentionnés plus haut.
us_country_code: NOT TRANSLATED YET
rules:
- en votre nom ou celui d'un membre de votre famille
- pas un téléphone virtuel (comme Google Voice ou Skype)
- pas un numéro de téléphone prépayé
- un numéro américain
return_to_profile: NOT TRANSLATED YET
return_to_sp_html: NOT TRANSLATED YET
review:
Expand Down Expand Up @@ -201,7 +197,7 @@ fr:
review: Réviser et soumettre
select_verification: Activer votre compte
session:
phone: Obtenez un code par téléphone
phone: Entrez un numéro de téléphone pour vous aider à vérifier votre identité
review: Encryptez vos données personnelles en entrant votre mot de passe
success: Nous avons vérifié les informations sur votre ID d'état.
sessions: Informations sur vous
Expand Down