<%= t('in_person_proofing.body.barcode.deadline', deadline: @presenter.formatted_due_date) %>
-<%= t('in_person_proofing.body.barcode.deadline_restart') %>
+ <%= t('in_person_proofing.headings.barcode') %> <% end %> -<%= t('in_person_proofing.body.barcode.email_sent') %>
- -- <% if @presenter.service_provider_homepage_url.present? %> - <%= render ClickObserverComponent.new(event_name: 'IdV: user clicked sp link on ready to verify page') do %> - <%= t( - 'in_person_proofing.body.barcode.return_to_partner_html', - link: link_to( - t( - 'in_person_proofing.body.barcode.return_to_partner_link', - sp_name: @presenter.sp_name, - ), - @presenter.service_provider_homepage_url, - ), - ) %> - <% end %> - <% else %> - <%= t('in_person_proofing.body.barcode.close_window') %> - <% end %> -
- -<%= t('in_person_proofing.body.barcode.speak_to_associate') %>
- <%= render ProcessListComponent.new(heading_level: :h3, class: 'margin-y-3') do |c| %> - <% c.item(heading: t('in_person_proofing.process.barcode.heading')) do %> -<%= t('in_person_proofing.process.barcode.info') %>
-<%= t('in_person_proofing.body.barcode.deadline', deadline: @presenter.formatted_due_date) %>
+<%= t('in_person_proofing.body.barcode.deadline_restart') %>
+<% end %> + +<%= t('in_person_proofing.process.what_to_do.info', app_name: APP_NAME) %>
<% end %> - <% c.item(heading: t('in_person_proofing.process.state_id.heading')) do %> -<%= t('in_person_proofing.process.state_id.info') %>
-<%= t('in_person_proofing.process.state_id.no_other_documents') %>
+ <% c.item(heading: t('in_person_proofing.process.barcode.heading', app_name: APP_NAME)) do %> +<%= t('in_person_proofing.process.barcode.info') %>
<% end %> - <% if @presenter.needs_proof_of_address? %> - <% c.item(heading: t('in_person_proofing.process.proof_of_address.heading')) do %> -<%= t('in_person_proofing.process.proof_of_address.info') %>
-<%= t('in_person_proofing.process.proof_of_address.physical_or_digital_copy') %>
- <% end %> + <% c.item(heading: t('in_person_proofing.process.state_id.heading')) do %> +<%= t('in_person_proofing.process.state_id.info') %>
<% end %> <% end %>@@ -97,8 +55,16 @@
+ <%= t('in_person_proofing.body.location.info') %> + <% if @presenter.selected_location_details.present? %> + <%= t('in_person_proofing.body.location.selection') %> + <% end %> +
+ <% if @presenter.selected_location_details.present? %> -<%= t('in_person_proofing.body.expect.info') %>
+ +<%= t('in_person_proofing.body.barcode.email_sent') %>
+ ++ <% if @presenter.service_provider_homepage_url.present? %> + <%= render ClickObserverComponent.new(event_name: 'IdV: user clicked sp link on ready to verify page') do %> + <%= t( + 'in_person_proofing.body.barcode.return_to_partner_html', + link: link_to( + t( + 'in_person_proofing.body.barcode.return_to_partner_link', + sp_name: @presenter.sp_name, + ), + @presenter.service_provider_homepage_url, + ), + ) %> + <% end %> + <% else %> + <%= t('in_person_proofing.body.barcode.close_window') %> + <% end %> +
+ <%= render PageFooterComponent.new do %> <%= link_to t('in_person_proofing.body.barcode.cancel_link_text'), idv_cancel_path(step: 'barcode') %> <% end %> diff --git a/app/views/user_mailer/in_person_ready_to_verify.html.erb b/app/views/user_mailer/in_person_ready_to_verify.html.erb index 915d0cc3343..2c334b078ab 100644 --- a/app/views/user_mailer/in_person_ready_to_verify.html.erb +++ b/app/views/user_mailer/in_person_ready_to_verify.html.erb @@ -1,6 +1 @@ -
- <%= t('user_mailer.in_person_ready_to_verify.greeting') %>
- <%= t('user_mailer.in_person_ready_to_verify.intro') %>
-
| @@ -10,56 +20,33 @@ |
<%= t('in_person_proofing.body.barcode.speak_to_associate') %>
1 |
- <%= t('in_person_proofing.process.barcode.heading') %>-<%= t('in_person_proofing.process.barcode.info') %> -
- <%= render 'idv/shared/mini_logo', filename: 'logo.png' %>
- <%= render BarcodeComponent.new(
- barcode_data: @presenter.enrollment_code,
- barcode_image_url: @presenter.barcode_image_url,
- label: nil,
- label_formatter: Idv::InPerson::EnrollmentCodeFormatter.method(:format),
- ) %>
-
+ <%= t('in_person_proofing.process.what_to_do.heading') %>+<%= t('in_person_proofing.process.what_to_do.info', app_name: APP_NAME) %> + |
2 |
+
+ <%= t('in_person_proofing.process.barcode.heading', app_name: APP_NAME) %>+<%= t('in_person_proofing.process.barcode.info') %> + |
+
3 |
<%= t('in_person_proofing.process.state_id.heading') %><%= t('in_person_proofing.process.state_id.info') %> -
<%= t('in_person_proofing.process.state_id.no_other_documents') %> |
3 |
-
- <%= t('in_person_proofing.process.proof_of_address.heading') %>-<%= t('in_person_proofing.process.proof_of_address.info') %> -
<%= t('in_person_proofing.process.proof_of_address.physical_or_digital_copy') %> - |
-
<%= t('in_person_proofing.body.barcode.questions') %> @@ -73,6 +60,14 @@
+ <%= t('in_person_proofing.body.location.info') %> + <% if @presenter.selected_location_details.present? %> + <%= t('in_person_proofing.body.location.selection') %> + <% end %> +
+ <% if @presenter.selected_location_details.present? %><%= t('in_person_proofing.body.expect.info') %>
\ No newline at end of file diff --git a/config/locales/doc_auth/en.yml b/config/locales/doc_auth/en.yml index c6b28ea55f3..e8ea408ee78 100644 --- a/config/locales/doc_auth/en.yml +++ b/config/locales/doc_auth/en.yml @@ -17,7 +17,7 @@ en: alerts: barcode_content_check: We couldn’t read the barcode on the back of your ID. It could be because of a problem with the barcode, or the barcode is a - new type that we don’t recognize yet. Use another state-issued ID if + new type that we don’t recognize yet. Use another state‑issued ID if you have one. barcode_read_check: We couldn’t read the barcode on the back of your ID. Try taking a new picture. @@ -44,7 +44,7 @@ en: visible_photo_check: We couldn’t verify the photo on your ID. Try taking new pictures. barcode_attention: confirm_info: If the information below is incorrect, please upload new photos of - your state-issued ID. + your state‑issued ID. heading: We couldn’t read the barcode on your ID. camera: blocked: Your camera is blocked @@ -102,12 +102,12 @@ en: headings: address: Update your mailing address back: Back - capture_complete: We have verified your state-issued ID + capture_complete: We have verified your state‑issued ID capture_scan_warning_html: We couldn’t read the barcode on your ID. If the - information below is incorrect, please %{link} of your state-issued ID. + information below is incorrect, please %{link} of your state‑issued ID. capture_scan_warning_link: upload new photos - capture_troubleshooting_tips: Having trouble adding your state-issued ID? - document_capture: Add your state-issued ID + capture_troubleshooting_tips: Having trouble adding your state‑issued ID? + document_capture: Add your state‑issued ID document_capture_back: Back of your ID document_capture_front: Front of your ID front: Front @@ -142,7 +142,7 @@ en: capture_status_small_document: Move Closer capture_status_tap_to_capture: Tap to Capture document_capture_intro_acknowledgment: We’ll collect information about you by - reading your state-issued ID. We use this information to verify your + reading your state‑issued ID. We use this information to verify your identity. image_loaded: Image loaded image_loading: Image loading @@ -155,7 +155,7 @@ en: learn_more: Learn more about how we protect your sensitive information lets_go: 'Identity verification happens in two parts:' link_sent: Please check your phone and follow instructions to take a photo of - your state-issued ID. + your state‑issued ID. link_sent_complete_no_polling: When you are done, click Continue here to finish verifying your identity. link_sent_complete_polling: The next step will load automatically. no_sp_name: The agency that you are trying to access @@ -168,7 +168,7 @@ en: ssn: We need your Social Security number to verify your name, date of birth and address. tag: Recommended - upload: We’ll collect information about you by reading your state-issued ID. + upload: We’ll collect information about you by reading your state‑issued ID. upload_from_computer: Don’t have a phone? Upload photos of your ID from this computer. upload_from_phone: You won’t have to sign in again, and you’ll switch back to this computer after you take photos. Your mobile phone must have a @@ -179,7 +179,7 @@ en: pretending to be you.' you_entered: 'You entered:' instructions: - bullet1: State-issued ID + bullet1: State‑issued ID bullet2: Social Security number bullet3: Phone number OR home address consent: By checking this box, you are letting %{app_name} ask for, use, keep, @@ -218,7 +218,7 @@ en: document_capture_id_text2: Take the photo on a flat surface document_capture_id_text3: Do not use the flash on your camera document_capture_id_text4: File size should be at least 2 MB - review_issues_id_header_text: 'Review the images of your state-issued ID:' + review_issues_id_header_text: 'Review the images of your state‑issued ID:' review_issues_id_text1: Did you use a dark background? review_issues_id_text2: Did you take the photo on a flat surface? review_issues_id_text3: Is the flash on your camera off? diff --git a/config/locales/headings/en.yml b/config/locales/headings/en.yml index 767d44b2d05..4de2f26bb75 100644 --- a/config/locales/headings/en.yml +++ b/config/locales/headings/en.yml @@ -66,7 +66,7 @@ en: sign_in_without_sp: Sign in sp_handoff_bounced: There was a problem connecting to %{sp_name} ssn: Social Security Number - state_id: State-issued ID + state_id: State‑issued ID totp_setup: new: Add an authentication app verify: Verify your information diff --git a/config/locales/idv/en.yml b/config/locales/idv/en.yml index 133f105d89b..5a4120e953c 100644 --- a/config/locales/idv/en.yml +++ b/config/locales/idv/en.yml @@ -133,7 +133,7 @@ en: - If you forgot your password, you’ll need to reset it and fill out the form again. - You’ll have to re-enter your personal information, like your name, - state-issued ID, etc. + state‑issued ID, etc. form: address1: Address line 1 address2: Address line 2 @@ -154,8 +154,8 @@ en: index: id: need_html: If you’re creating an account, you’ll need a current - state-issued ID. - state_issue: State-issued ID + state‑issued ID. + state_issue: State‑issued ID messages: activated_html: Your identity has been verified. If you need to change your verified information, please %{link}. @@ -227,7 +227,7 @@ en: need_assistance: 'Need immediate assistance? Here’s how to get help:' still_having_trouble: Still having trouble? options: - add_new_photos: Add new photos of your state-issued ID + add_new_photos: Add new photos of your state‑issued ID contact_support: Contact %{app_name} Support doc_capture_tips: More tips for adding photos of your ID get_help_at_sp: Get help at %{sp_name} @@ -235,7 +235,7 @@ en: learn_more_verify_by_mail: Learn more about verifying your address by mail learn_more_verify_by_phone: Learn more about what phone number to use learn_more_verify_in_person: Learn more about verifying in person - supported_documents: See a list of accepted state-issued IDs + supported_documents: See a list of accepted state‑issued IDs verify_by_mail: Verify your address by mail instead unavailable: exit_button: 'Exit %{app_name}' diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml index 2508606b0c8..a3d82824ae7 100644 --- a/config/locales/in_person_proofing/en.yml +++ b/config/locales/in_person_proofing/en.yml @@ -9,21 +9,19 @@ en: barcode: cancel_link_text: Cancel your barcode close_window: You may now close this window. - deadline: Visit the Post Office by %{deadline}. - deadline_restart: If you go after the deadline, your information will not be + deadline: You must visit any participating Post Office by %{deadline}. + deadline_restart: If you go after this deadline, your information will not be saved and you will need to restart the process. - email_sent: We have sent this information to the email you used to log in. - items_to_bring: 'Show the following items to any Post Office associate:' + email_sent: We have sent this information to the email you used to sign in. learn_more: Learn more about what to bring location_details: Location details - questions: Question? + questions: Questions? retail_hours: Retail hours retail_hours_closed: Closed - return_to_partner_html: You may now close this window or %{link} to complete any - next steps you can access until your identity has been verified. - return_to_partner_link: return to %{sp_name} - speak_to_associate: You can see any Post Office associate at the retail window - to verify your identity. No appointment is required. + return_to_partner_html: You may now %{link} to complete any next steps you can + access until your identity has been verified. + return_to_partner_link: sign out and return to %{sp_name} + what_to_expect: What to expect at the Post Office cta: button: Verify your ID in person button_variant: Try in person @@ -31,10 +29,18 @@ en: Post Office near you. prompt_detail_b: Alternatively, if you are having trouble adding your ID online, you may be able to try in person at limited post office locations. + expect: + heading: What to expect after your visit + info: We’ll send you an email to let you know if your identity verification was + successful or unsuccessful within 24 hours of your visit to the Post + Office. location: distance: one: '%{count} mile away' other: '%{count} miles away' + heading: Post Office information + info: No appointment is needed to verify your identity. You can visit any + participating Post Office location. inline_error: Enter a valid address with city, state, and ZIP code location_button: Select po_search: @@ -58,6 +64,7 @@ en: retail_hours_sat: 'Sat:' retail_hours_sun: 'Sun:' retail_hours_weekday: 'Monday to Friday:' + selection: 'This is the location you selected:' prepare: alert_selected_post_office: You’ve selected the Post Office at %{full_address}. privacy_disclaimer: '%{app_name} is a secure, government website. We and the @@ -67,10 +74,10 @@ en: verify_step_about: 'Complete the steps below to generate the barcode you’ll take with you to the Post Office:' verify_step_enter_phone: Enter your primary phone number or the number that you use most often. - verify_step_enter_pii: Enter your name, date of birth, state-issued ID number, + verify_step_enter_pii: Enter your name, date of birth, state‑issued ID number, address and Social Security number. state_id: - alert_message: 'Your state-issued ID must not be expired. Accepted forms of ID are:' + alert_message: 'Your state‑issued ID must not be expired. Accepted forms of ID are:' id_types: - State Driver’s License - State Non-Driver’s Identification Card @@ -85,10 +92,10 @@ en: unsupported_chars: 'Our system cannot read the following characters: %{char_list}. Please try again using substitutes for those characters.' - same_address: Is this address displayed on the state-issued ID that you are + same_address: Is this address displayed on the state‑issued ID that you are bringing to the Post Office? same_address_choice_no: I have a different address on my ID - same_address_choice_yes: This address is on my state-issued ID + same_address_choice_yes: This address is on my state‑issued ID state_prompt: '- Select -' state_id: address1: Address line 1 @@ -114,9 +121,9 @@ en: missing_month_day_year: Enter a date of birth range_min_age: You must be over 13 years of age to use %{app_name} range_overflow: Enter a date that is in the past - same_address_as_id: Do you currently live at the address listed on your state-issued ID? + same_address_as_id: Do you currently live at the address listed on your state‑issued ID? same_address_as_id_no: No, I live at a different address - same_address_as_id_yes: Yes, I live at the address on my state-issued ID + same_address_as_id_yes: Yes, I live at the address on my state‑issued ID state_id_jurisdiction: Issuing state state_id_jurisdiction_hint: This is the state that issued your ID state_id_jurisdiction_prompt: '- Select -' @@ -125,39 +132,30 @@ en: zipcode: ZIP Code headings: address: Enter your current residential address - barcode: You’re ready to verify your identity in person with %{app_name} + barcode: Show this barcode and your state‑issued ID at a Post Office to finish + verifying your identity cta: Having trouble verifying your ID online? cta_variant: Try verifying your ID in person id_address: Address on your ID po_search: location: Find a participating Post Office prepare: Verify your identity in person - state_id_milestone_2: Enter the information on your state-issued ID + state_id_milestone_2: Enter the information on your state‑issued ID switch_back: Switch back to your computer to prepare to verify your identity in person update_address: Update your current address update_state_id: Update the information on your ID process: barcode: caption_label: Enrollment code - heading: A copy of your barcode - info: Print or scan from your mobile device. - proof_of_address: - acceptable_proof: - - Lease, Mortgage, or Deed of Trust - - Voter Registration - - Vehicle Registration Card - - Home or Vehicle Insurance Policy - heading: Proof of your current address - info: 'You need a proof of address if your current address is different than the - address on your ID. Acceptable forms of proof of address are:' - physical_or_digital_copy: You can bring a physical copy or show a digital copy - of the document. You cannot show a photo or screenshot of the - document. + heading: Show your %{app_name} barcode + info: The retail associate needs to scan your barcode at the top of this page. + You can print this page or show it on your mobile device. state_id: - acceptable_documents: - - State Driver’s License - - State Non-Driver’s Identification Card - heading: Your State Driver’s License or State Non-Driver’s Identification Card - info: 'Your ID must not be expired. Acceptable forms of ID are:' - no_other_documents: We do not currently accept any other forms of + heading: Show your State Driver’s License or State Non-Driver’s Identification + Card + info: This must not be expired. We do not currently accept any other forms of identification, such as passports and military IDs. + what_to_do: + heading: Stand in any line + info: Tell the Post Office retail associate you are here to verify your identity + with %{app_name}. diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml index 57b8ad7bc48..d9653dccbe9 100644 --- a/config/locales/in_person_proofing/es.yml +++ b/config/locales/in_person_proofing/es.yml @@ -10,24 +10,21 @@ es: barcode: cancel_link_text: Cancelar su código de barras close_window: Ya puede cerrar esta ventana - deadline: Visite la Oficina de correos antes del %{deadline} + deadline: Debe dirigirse a cualquier oficina de correos asociada antes del + %{deadline} deadline_restart: Si supera la fecha límite, su información no se guardará y tendrá que reiniciar el proceso. - email_sent: Hemos enviado esta información al correo electrónico que usó para - iniciar sesión. - items_to_bring: 'Muestre los siguientes documentos a cualquier empleado de la - Oficina de correos:' + email_sent: Enviamos toda esta información al correo electrónico que utilizó + para iniciar sesión. learn_more: Entérese más sobre qué debe traer. location_details: Detalles de la ubicación questions: '¿Tiene alguna pregunta?' retail_hours: Horario de atención al público retail_hours_closed: Cerrado - return_to_partner_html: Ya puede cerrar esta ventana o %{link} para finalizar - los pasos a los que tenga acceso hasta que su identidad sea - verificada. - return_to_partner_link: regresar a %{sp_name} - speak_to_associate: Para verificar su identidad, puede acudir a cualquier - empleado en ventanilla. No es necesario pedir cita. + return_to_partner_html: Ahora puede %{link} para completar los pasos siguientes + a los que tenga acceso hasta que se verifique su identidad. + return_to_partner_link: cerrar sesión y regresar a %{sp_name} + what_to_expect: Qué esperar en la oficina de correos cta: button: Verifique su identificación en persona button_variant: Inténtelo en persona @@ -35,10 +32,18 @@ es: persona en una oficina de correos participante cercana. prompt_detail_b: Si tiene problemas para añadir su documento de identidad en línea, puede intentarlo en persona en algunas oficinas de correos. + expect: + heading: Qué esperar después de la visita + info: Le enviaremos un correo electrónico para informarle si su verificación de + identidad se realizó con éxito o no en las siguientes 24 horas después + de su visita a la oficina de correos. location: distance: one: '%{count} milla de distancia' other: '%{count} millas de distancia' + heading: Información postal + info: No necesita cita previa para verificar su identidad. Puede dirigirse a + cualquier oficina de correos asociada. inline_error: Ingrese una dirección válida que incluya ciudad, estado y código postal location_button: Seleccionar po_search: @@ -66,6 +71,7 @@ es: retail_hours_sat: 'Sáb:' retail_hours_sun: 'Dom:' retail_hours_weekday: 'De Lunes a Viernes:' + selection: 'Esta es la oficina que seleccionó:' prepare: alert_selected_post_office: Ha seleccionado la oficina de correos a %{full_address}. privacy_disclaimer: '%{app_name} es un sitio web seguro del gobierno. Nosotros y @@ -140,7 +146,8 @@ es: zipcode: Código postal headings: address: Ingresa tu domicilio actual - barcode: Está listo para verificar su identidad en persona con %{app_name} + barcode: Muestre este código de barras y su documento nacional de identidad en + una oficina de correos para terminar de verificar su identidad cta: ¿Tiene problemas para verificar su documento de identidad en línea? cta_variant: Intente verificar su ID en persona id_address: Domicilio que consta en su identificación @@ -155,28 +162,16 @@ es: process: barcode: caption_label: Código de registro - heading: Una copia de su código de barras - info: Imprima o escanee desde su dispositivo móvil. - proof_of_address: - acceptable_proof: - - Arrendamiento, hipoteca o escritura de fideicomiso - - Registro de votantes - - Tarjeta de registro del vehículo - - Póliza de seguro del hogar o del vehículo - heading: Prueba de su dirección actual - info: 'Necesita un justificante de domicilio si su dirección actual es diferente - a la que figura en su cédula de identidad. Los comprobantes de - domicilio aceptables son:' - physical_or_digital_copy: Puede traer una copia física o mostrar una copia - digital del documento. No puede mostrar una foto o una captura de - pantalla del documento. + heading: Muestre su código de barras de %{app_name} + info: El empleado deberá escanear el código de barras que aparece en la parte + superior de esta página. Puede imprimir esta página o mostrarla en su + dispositivo móvil. state_id: - acceptable_documents: - - Licencia de conducir estatal - - Tarjeta de identificación estatal para no conductores. - heading: Su licencia de conducir estatal o documento de identidad estatal para - no conductores - info: 'Su cédula de identidad no debe estar caducada. Las formas de - identificación aceptables son:' - no_other_documents: Actualmente no aceptamos otras formas de identificación, - como pasaportes y cartillas militares. + heading: Muestre su licencia de conducir estatal o su tarjeta de identificación + estatal de no conductor + info: No debe estar caducada. Actualmente no aceptamos otras formas de + identificación, como pasaportes e identificaciones militares.. + what_to_do: + heading: Colóquese en cualquier fila + info: Dígale al empleado de la oficina de correos que está aquí para verificar + su identidad con %{app_name}. diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml index 9755b810d5b..2324c7b492c 100644 --- a/config/locales/in_person_proofing/fr.yml +++ b/config/locales/in_person_proofing/fr.yml @@ -10,24 +10,22 @@ fr: barcode: cancel_link_text: Annulez votre code-barres close_window: Vous pouvez maintenant fermer cette fenêtre - deadline: Visitez le bureau de poste d’ici %{deadline} + deadline: Vous devez vous rendre dans un bureau de poste participant avant le + %{deadline} deadline_restart: Si vous partez après la date limite, vos informations ne seront pas sauvegardées et vous devrez recommencer le processus. email_sent: Nous avons envoyé ces informations à l’adresse électronique que vous avez utilisée pour vous connecter. - items_to_bring: 'Présentez les éléments suivants à n’importe quel collaborateur - d’un bureau de Poste:' learn_more: En savoir davantage sur ce qu’il faut apporter. location_details: Détails de l’emplacement questions: Des questions? retail_hours: Heures d’ouverture retail_hours_closed: Fermé - return_to_partner_html: Vous pouvez maintenant fermer cette fenêtre ou %{link} - afin d’effectuer toutes les étapes suivantes auxquelles vous pouvez - accéder jusqu’à ce que votre identité ait été confitmée. - return_to_partner_link: retourner à %{sp_name} - speak_to_associate: Vous pouvez voir n’importe quel associé au guichet de vente - au détail pour vérifier votre identité. Aucun rendez-vous n’est exigé. + return_to_partner_html: Vous pouvez %{link} afin d’effectuer toutes les étapes + suivantes auxquelles vous pouvez accéder jusqu’à ce que votre identité + ait été confitmée. + return_to_partner_link: maintenant vous déconnecter et retourner à %{sp_name} + what_to_expect: À quoi s’attendre au bureau de poste cta: button: Vérifiez votre identité en personne button_variant: Essayer en personne @@ -36,10 +34,18 @@ fr: prompt_detail_b: Ou, si vous rencontrez des difficultés pour ajouter votre pièce d’identité en ligne, vous pourrez peut-être essayer de le faire en personne dans certains bureaux de poste. + expect: + heading: Que faire après votre visite + info: Dans les 24 heures suivant votre visite au bureau de poste, nous vous + enverrons un courrier électronique pour vous indiquer si votre + vérification d’identité a réussi ou échoué. location: distance: one: 'à %{count} mile' other: 'à %{count} miles' + heading: Informations sur les bureaux de poste + info: Aucun rendez-vous n’est nécessaire pour vérifier votre identité. Vous + pouvez vous rendre dans n’importe quel bureau de poste participant. inline_error: Saisissez une adresse valide avec la ville, l’état et le code postal location_button: Sélectionner po_search: @@ -62,10 +68,11 @@ fr: results_instructions: Sélectionnez un emplacement de bureau de poste ci-dessous, ou effectuez une nouvelle recherche en utilisant une autre adresse. search_button: Rechercher - retail_hours_heading: Heures d’ouverture + retail_hours_heading: Heures de vente au détail retail_hours_sat: 'Sam:' retail_hours_sun: 'Dim:' retail_hours_weekday: 'Lundi à Vendredi:' + selection: 'Il s’agit du bureau que vous avez sélectionné:' prepare: alert_selected_post_office: Vous avez sélectionné le bureau de poste à %{full_address}. privacy_disclaimer: '%{app_name} est un site gouvernemental sécurisé. Nous et le @@ -141,7 +148,8 @@ fr: zipcode: Code postal headings: address: Indiquez votre adresse résidentielle actuelle - barcode: Vous êtes prêt à vérifier votre identité en personne avec %{app_name} + barcode: Présentez ce code-barres et votre pièce d’identité délivrée par l’État + à un bureau de poste pour terminer la vérification de votre identité cta: Vous avez des difficultés à vérifier votre identité en ligne? cta_variant: Essayez de vérifier votre identité en personne id_address: Adresse sur votre pièce d’identité @@ -157,29 +165,16 @@ fr: process: barcode: caption_label: Code d’inscription - heading: Une copie de votre code-barres - info: Imprimez ou numérisez depuis votre appareil mobile. - proof_of_address: - acceptable_proof: - - Bail, hypothèque ou acte de fiducie - - Inscription sur les listes électorales - - Carte d’immatriculation du véhicule - - Police d’assurance habitation ou véhicule - heading: Preuve de votre adresse actuelle - info: 'Vous avez besoin d’un justificatif de domicile si votre adresse actuelle - est différente de l’adresse figurant sur votre document d’identité. - Les justificatifs d’adresse acceptés sont les suivants:' - physical_or_digital_copy: Vous pouvez apporter une copie physique ou montrer une - copie numérique du document. Vous ne pouvez pas montrer une photo ou - une capture d’écran du document. + heading: Montrez votre code-barres %{app_name} + info: Le vendeur doit scanner votre code-barres en haut de cette page. Vous + pouvez imprimer cette page ou la montrer sur votre appareil mobile. state_id: - acceptable_documents: - - Permis de conduire d’État - - Document d’identité de non-conducteur d’État - heading: Votre permis de conduire ou votre permis d’État Carte d’identité de - non-conducteur - info: 'Votre pièce d’identité ne doit pas être expirée. Les formes - d’identification acceptables sont:' - no_other_documents: Nous n’acceptons actuellement aucune autre forme - d’identification, comme les passeports et les documents d’identité - militaires. + heading: Présentez votre permis de conduire de l’État ou votre carte d’identité + de non-conducteur de l’État + info: Ce document ne doit pas avoir expiré. Nous n’acceptons actuellement aucune + autre forme d’identification, comme les passeports et les cartes + d’identité militaires. + what_to_do: + heading: Faites la queue + info: Dites à l’employé du bureau de poste que vous êtes ici pour vérifier votre + identité avec %{app_name}. diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml index b1e713ef764..361d5ba1db3 100644 --- a/config/locales/user_mailer/en.yml +++ b/config/locales/user_mailer/en.yml @@ -126,7 +126,7 @@ en: %{date}. subject: Your identity could not be verified in person verifying_identity: 'When verifying your identity:' - verifying_step_not_expired: Your state-issued ID or driver’s license must not be + verifying_step_not_expired: Your state‑issued ID or driver’s license must not be expired. We do not currently accept any other forms of identification, such as passports and military IDs. verifying_step_proof_of_address: If you try to verify your identity in person @@ -143,9 +143,6 @@ en: greeting: Hello, subject: Your identity could not be verified in person in_person_ready_to_verify: - greeting: Hello, - intro: Here are the details to verify your identity in person at a United States - Post Office near you. subject: You’re ready to verify your identity with %{app_name} in person in_person_ready_to_verify_reminder: greeting: Hello, diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml index 4cfbd7eb291..6cab8ed60fd 100644 --- a/config/locales/user_mailer/es.yml +++ b/config/locales/user_mailer/es.yml @@ -152,9 +152,6 @@ es: greeting: Hola, subject: No se pudo verificar su identidad en persona in_person_ready_to_verify: - greeting: Hola, - intro: Estos son los detalles para verificar su identidad en persona en una - oficina de correos de los Estados Unidos cercana a usted. subject: Está listo para verificar su identidad con %{app_name} en persona in_person_ready_to_verify_reminder: greeting: Hola, diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml index 9e3acdbce32..970e957e37b 100644 --- a/config/locales/user_mailer/fr.yml +++ b/config/locales/user_mailer/fr.yml @@ -154,9 +154,6 @@ fr: greeting: Bonjour, subject: Votre identité n’a pas pu être vérifiée en personne in_person_ready_to_verify: - greeting: Bonjour, - intro: Voici les détails pour vérifier votre identité en personne dans un bureau - de poste des États-Unis près de chez vous. subject: Vous êtes prêt à vérifier votre identité avec %{app_name} en personne in_person_ready_to_verify_reminder: greeting: Bonjour, diff --git a/config/service_providers.localdev.yml b/config/service_providers.localdev.yml index 0a103c5df09..86b96114d01 100644 --- a/config/service_providers.localdev.yml +++ b/config/service_providers.localdev.yml @@ -426,6 +426,7 @@ development: agency_id: 1 ial: 2 push_notification_url: http://localhost:9292/api/push_notifications + return_to_sp_url: 'http://localhost:9292' redirect_uris: - 'http://localhost:9292/' - 'http://localhost:9292/auth/result' @@ -433,6 +434,7 @@ development: certs: - 'sp_sinatra_demo' friendly_name: 'Example Sinatra App' + in_person_proofing_enabled: true 'urn:gov:gsa:openidconnect:sp:mock_irs': agency_id: 1 diff --git a/spec/features/idv/actions/redo_document_capture_action_spec.rb b/spec/features/idv/actions/redo_document_capture_action_spec.rb index 210c83aa0a3..40e7ff685ae 100644 --- a/spec/features/idv/actions/redo_document_capture_action_spec.rb +++ b/spec/features/idv/actions/redo_document_capture_action_spec.rb @@ -20,7 +20,10 @@ expect(page).to have_css( '[role="status"]', - text: t('doc_auth.headings.capture_scan_warning_html', link: warning_link_text), + text: t( + 'doc_auth.headings.capture_scan_warning_html', + link: warning_link_text, + ).tr(' ', ' '), ) click_link warning_link_text @@ -57,7 +60,10 @@ expect(page).to have_css( '[role="status"]', - text: t('doc_auth.headings.capture_scan_warning_html', link: warning_link_text), + text: t( + 'doc_auth.headings.capture_scan_warning_html', + link: warning_link_text, + ).tr(' ', ' '), ) click_link warning_link_text diff --git a/spec/features/idv/analytics_spec.rb b/spec/features/idv/analytics_spec.rb index f79b9d59cea..6fdf54a23c0 100644 --- a/spec/features/idv/analytics_spec.rb +++ b/spec/features/idv/analytics_spec.rb @@ -202,7 +202,10 @@ allow(IdentityConfig.store).to receive(:in_person_cta_variant_testing_enabled). and_return(false) allow(Idv::InPersonConfig).to receive(:enabled_for_issuer?).and_return(true) - ServiceProvider.find_by(issuer: sp1_issuer).update(return_to_sp_url: return_sp_url) + allow_any_instance_of(Idv::InPerson::ReadyToVerifyPresenter). + to receive(:service_provider_homepage_url).and_return(return_sp_url) + allow_any_instance_of(Idv::InPerson::ReadyToVerifyPresenter). + to receive(:sp_name).and_return(sp_friendly_name) start_idv_from_sp(:saml) sign_in_and_2fa_user(user) diff --git a/spec/features/idv/doc_auth/document_capture_spec.rb b/spec/features/idv/doc_auth/document_capture_spec.rb index 1ea5230a0f7..7a1fb912452 100644 --- a/spec/features/idv/doc_auth/document_capture_spec.rb +++ b/spec/features/idv/doc_auth/document_capture_spec.rb @@ -42,7 +42,7 @@ it 'shows the new DocumentCapture page for desktop standard flow' do expect(page).to have_current_path(idv_document_capture_url) - expect(page).to have_content(t('doc_auth.headings.document_capture')) + expect(page).to have_content(t('doc_auth.headings.document_capture').tr(' ', ' ')) expect(page).to have_content(t('step_indicator.flows.idv.verify_id')) expect(fake_analytics).to have_logged_event( diff --git a/spec/features/idv/doc_auth/test_credentials_spec.rb b/spec/features/idv/doc_auth/test_credentials_spec.rb index d4226e7179a..c4ea0c9f0c5 100644 --- a/spec/features/idv/doc_auth/test_credentials_spec.rb +++ b/spec/features/idv/doc_auth/test_credentials_spec.rb @@ -41,7 +41,11 @@ ) click_on I18n.t('forms.buttons.submit.default') - expect(page).to have_content(I18n.t('doc_auth.errors.alerts.barcode_content_check')) + expect(page).to have_content( + I18n.t( + 'doc_auth.errors.alerts.barcode_content_check', + ).tr(' ', ' '), + ) expect(page).to have_current_path(idv_document_capture_url) end end diff --git a/spec/features/idv/doc_capture/capture_complete_step_spec.rb b/spec/features/idv/doc_capture/capture_complete_step_spec.rb index 5169c87e491..1a99f11883b 100644 --- a/spec/features/idv/doc_capture/capture_complete_step_spec.rb +++ b/spec/features/idv/doc_capture/capture_complete_step_spec.rb @@ -12,7 +12,7 @@ it 'is on the correct page' do expect(page).to have_current_path(idv_capture_doc_capture_complete_step) - expect(page).to have_content(t('doc_auth.headings.capture_complete')) + expect(page).to have_content(t('doc_auth.headings.capture_complete').tr(' ', ' ')) expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id')) end end diff --git a/spec/features/idv/doc_capture/document_capture_step_spec.rb b/spec/features/idv/doc_capture/document_capture_step_spec.rb index 76394f3b606..2c499af04c0 100644 --- a/spec/features/idv/doc_capture/document_capture_step_spec.rb +++ b/spec/features/idv/doc_capture/document_capture_step_spec.rb @@ -33,7 +33,7 @@ attach_and_submit_images expect(page).to have_current_path(next_step) - expect(page).to have_content(t('doc_auth.headings.capture_complete')) + expect(page).to have_content(t('doc_auth.headings.capture_complete').tr(' ', ' ')) end it 'offers the user the option to cancel and return to desktop' do @@ -95,7 +95,11 @@ Capybara.using_session('mobile') do visit request_uri attach_and_submit_images - expect(page).to have_content(t('doc_auth.errors.barcode_attention.confirm_info')) + expect(page).to have_content( + t( + 'doc_auth.errors.barcode_attention.confirm_info', + ).tr(' ', ' '), + ) click_button t('forms.buttons.continue') end @@ -153,7 +157,11 @@ Capybara.using_session('mobile') do visit request_uri attach_and_submit_images - expect(page).to have_content(t('doc_auth.errors.barcode_attention.confirm_info')) + expect(page).to have_content( + t( + 'doc_auth.errors.barcode_attention.confirm_info', + ).tr(' ', ' '), + ) click_button t('forms.buttons.continue') end diff --git a/spec/features/idv/hybrid_flow_spec.rb b/spec/features/idv/hybrid_flow_spec.rb index cdbd393386f..2bf11eefee7 100644 --- a/spec/features/idv/hybrid_flow_spec.rb +++ b/spec/features/idv/hybrid_flow_spec.rb @@ -38,7 +38,7 @@ perform_in_browser(:mobile) do visit @sms_link attach_and_submit_images - expect(page).to have_content(t('doc_auth.headings.capture_complete')) + expect(page).to have_content(t('doc_auth.headings.capture_complete').tr(' ', ' ')) expect(page).to have_text(t('doc_auth.instructions.switch_back')) expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id')) end diff --git a/spec/features/idv/hybrid_mobile/hybrid_mobile_spec.rb b/spec/features/idv/hybrid_mobile/hybrid_mobile_spec.rb index 17180858275..da8133cf39b 100644 --- a/spec/features/idv/hybrid_mobile/hybrid_mobile_spec.rb +++ b/spec/features/idv/hybrid_mobile/hybrid_mobile_spec.rb @@ -43,7 +43,7 @@ attach_and_submit_images expect(page).to have_current_path(idv_hybrid_mobile_capture_complete_url) - expect(page).to have_content(t('doc_auth.headings.capture_complete')) + expect(page).to have_content(t('doc_auth.headings.capture_complete').tr(' ', ' ')) expect(page).to have_text(t('doc_auth.instructions.switch_back')) expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id')) end diff --git a/spec/features/idv/in_person_spec.rb b/spec/features/idv/in_person_spec.rb index 2289a2a6c94..aa0b9b77892 100644 --- a/spec/features/idv/in_person_spec.rb +++ b/spec/features/idv/in_person_spec.rb @@ -50,7 +50,7 @@ expect(page).to have_text(InPersonHelper::GOOD_CITY) expect(page).to have_text(InPersonHelper::GOOD_ZIPCODE) expect(page).to have_text(Idp::Constants::MOCK_IDV_APPLICANT[:state]) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) complete_verify_step(user) # phone page @@ -95,7 +95,7 @@ enrollment_code = JSON.parse( UspsInPersonProofing::Mock::Fixtures.request_enroll_response, )['enrollmentCode'] - expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME)) + expect(page).to have_content(t('in_person_proofing.headings.barcode').tr(' ', ' ')) expect(page).to have_content(Idv::InPerson::EnrollmentCodeFormatter.format(enrollment_code)) expect(page).to have_content( t('in_person_proofing.body.barcode.deadline', deadline: deadline), @@ -132,13 +132,17 @@ expect_in_person_step_indicator_current_step( t('step_indicator.flows.idv.verify_info'), ) - expect(page).to have_content(t('in_person_proofing.headings.state_id_milestone_2')) + expect(page).to have_content( + t( + 'in_person_proofing.headings.state_id_milestone_2', + ).tr(' ', ' '), + ) complete_state_id_step(user) # address page expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.verify_info')) expect(page).to have_content(t('in_person_proofing.headings.address')) - expect(page).to have_content(t('in_person_proofing.form.address.same_address')) + expect(page).to have_content(t('in_person_proofing.form.address.same_address').tr(' ', ' ')) complete_address_step(user) # ssn page @@ -157,7 +161,7 @@ expect(page).to have_text(InPersonHelper::GOOD_CITY) expect(page).to have_text(InPersonHelper::GOOD_ZIPCODE) expect(page).to have_text(Idp::Constants::MOCK_IDV_APPLICANT[:state]) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) # click update state ID button click_button t('idv.buttons.change_state_id_label') @@ -222,7 +226,7 @@ UspsInPersonProofing::Mock::Fixtures.request_enroll_response, )['enrollmentCode'] expect(page).to have_css("img[alt='#{APP_NAME}']") - expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME)) + expect(page).to have_content(t('in_person_proofing.headings.barcode').tr(' ', ' ')) expect(page).to have_content(Idv::InPerson::EnrollmentCodeFormatter.format(enrollment_code)) expect(page).to have_content(t('in_person_proofing.body.barcode.deadline', deadline: deadline)) expect(page).to have_content('MILWAUKEE') diff --git a/spec/features/idv/steps/in_person/verify_info_spec.rb b/spec/features/idv/steps/in_person/verify_info_spec.rb index f71f2c0538d..edc2c3e942a 100644 --- a/spec/features/idv/steps/in_person/verify_info_spec.rb +++ b/spec/features/idv/steps/in_person/verify_info_spec.rb @@ -35,7 +35,7 @@ expect(page).to have_text(InPersonHelper::GOOD_CITY) expect(page).to have_text(InPersonHelper::GOOD_ZIPCODE) expect(page).to have_text(Idp::Constants::MOCK_IDV_APPLICANT[:state]) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) # click update state ID button click_button t('idv.buttons.change_state_id_label') @@ -61,7 +61,7 @@ fill_out_ssn_form_fail click_doc_auth_back_link expect(page).to have_content(t('headings.verify')) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) complete_verify_step(user) diff --git a/spec/features/idv/steps/in_person/verify_step_spec.rb b/spec/features/idv/steps/in_person/verify_step_spec.rb index f40a31f4483..12b974008ae 100644 --- a/spec/features/idv/steps/in_person/verify_step_spec.rb +++ b/spec/features/idv/steps/in_person/verify_step_spec.rb @@ -40,7 +40,7 @@ expect(page).to have_text(InPersonHelper::GOOD_DOB_FORMATTED_EVENT) expect(page).to have_text(InPersonHelper::GOOD_STATE_ID_NUMBER) expect_good_address - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) # click update state ID button click_button t('idv.buttons.change_state_id_label') @@ -66,7 +66,7 @@ fill_out_ssn_form_fail click_doc_auth_back_link expect(page).to have_content(t('headings.verify')) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) complete_verify_step(user) @@ -106,7 +106,7 @@ # verify page expect(page).to have_current_path(idv_in_person_step_url(step: :verify)) expect(page).to have_content(t('headings.verify')) - expect(page).to have_content(t('headings.state_id')) + expect(page).to have_content(t('headings.state_id').tr(' ', ' ')) expect(page).to have_text(InPersonHelper::GOOD_FIRST_NAME) expect(page).to have_text(InPersonHelper::GOOD_LAST_NAME) expect(page).to have_text(InPersonHelper::GOOD_DOB_FORMATTED_EVENT) @@ -119,7 +119,7 @@ expect(page).to have_content(t('headings.residential_address')) expect_good_address expect(page).to have_content(t('headings.ssn')) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) complete_verify_step(user) end @@ -155,7 +155,7 @@ # verify page expect(page).to have_current_path(idv_in_person_step_url(step: :verify)) expect(page).to have_content(t('headings.verify')) - expect(page).to have_content(t('headings.state_id')) + expect(page).to have_content(t('headings.state_id').tr(' ', ' ')) expect(page).to have_text(InPersonHelper::GOOD_FIRST_NAME) expect(page).to have_text(InPersonHelper::GOOD_LAST_NAME) expect(page).to have_text(InPersonHelper::GOOD_DOB_FORMATTED_EVENT) @@ -175,7 +175,7 @@ expect(page).to have_text(InPersonHelper::GOOD_IDENTITY_DOC_ZIPCODE).twice expect(page).to have_content(t('headings.residential_address')) expect(page).to have_content(t('headings.ssn')) - expect(page).to have_text('9**-**-***4') + expect(page).to have_text(DocAuthHelper::GOOD_SSN_MASKED) complete_verify_step(user) end diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 8b3da33d91b..64b4f534b02 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -556,23 +556,11 @@ def expect_email_body_to_have_help_and_contact_links it_behaves_like 'a system email' it_behaves_like 'an email that respects user email locale preference' - context 'double address verification is not enabled' do - it 'renders the body' do - expect(mail.html_part.body). - to have_content( - t('in_person_proofing.process.proof_of_address.heading'), - ) - end - end - - context 'double address verification is enabled' do - let(:capture_secondary_id_enabled) { true } - it 'renders the body' do - expect(mail.html_part.body). - to_not have_content( - t('in_person_proofing.process.proof_of_address.heading'), - ) - end + it 'renders the body' do + expect(mail.html_part.body). + to have_content( + t('in_person_proofing.process.state_id.heading'), + ) end end @@ -589,23 +577,11 @@ def expect_email_body_to_have_help_and_contact_links it_behaves_like 'a system email' it_behaves_like 'an email that respects user email locale preference' - context 'double address verification is not enabled' do - it 'renders the body' do - expect(mail.html_part.body). - to have_content( - t('in_person_proofing.process.proof_of_address.heading'), - ) - end - end - - context 'double address verification is enabled' do - let(:capture_secondary_id_enabled) { true } - it 'renders the body' do - expect(mail.html_part.body). - to_not have_content( - t('in_person_proofing.process.proof_of_address.heading'), - ) - end + it 'renders the body' do + expect(mail.html_part.body). + to have_content( + t('in_person_proofing.process.state_id.heading'), + ) end end diff --git a/spec/support/features/idv_step_helper.rb b/spec/support/features/idv_step_helper.rb index e1e6f139772..ba5e74d22c5 100644 --- a/spec/support/features/idv_step_helper.rb +++ b/spec/support/features/idv_step_helper.rb @@ -60,7 +60,7 @@ def visit_help_center end def click_what_to_bring_link - expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME)) + expect(page).to have_content(t('in_person_proofing.headings.barcode').tr(' ', ' ')) click_link t('in_person_proofing.body.barcode.learn_more') end @@ -68,14 +68,21 @@ def visit_sp click_sp_link end + def sp_friendly_name + 'Test SP' + end + + def link_text + t('in_person_proofing.body.barcode.return_to_partner_link', sp_name: sp_friendly_name) + end + def click_sp_link expect(page).to have_content(sp_text) - click_link('return to Test SP') + click_link(link_text) end def sp_text - 'You may now close this window or return to Test SP to complete any next steps' \ - ' you can access until your identity has been verified.' + t('in_person_proofing.body.barcode.return_to_partner_html', link: link_text) end def complete_review_step(user = user_with_2fa) diff --git a/spec/views/idv/in_person/ready_to_verify/show.html.erb_spec.rb b/spec/views/idv/in_person/ready_to_verify/show.html.erb_spec.rb index 6ba33ce9988..e1c96bb0291 100644 --- a/spec/views/idv/in_person/ready_to_verify/show.html.erb_spec.rb +++ b/spec/views/idv/in_person/ready_to_verify/show.html.erb_spec.rb @@ -65,26 +65,6 @@ ) end - context 'with enrollment where current address matches id' do - let(:current_address_matches_id) { true } - - it 'renders without proof of address instructions' do - render - - expect(rendered).not_to have_content(t('in_person_proofing.process.proof_of_address.heading')) - end - end - - context 'with enrollment where current address does not match id' do - let(:current_address_matches_id) { false } - - it 'renders with proof of address instructions' do - render - - expect(rendered).to have_content(t('in_person_proofing.process.proof_of_address.heading')) - end - end - context 'with enrollment where selected_location_details is present' do it 'renders a location' do render