diff --git a/app/javascript/packages/document-capture/components/acuant-capture.tsx b/app/javascript/packages/document-capture/components/acuant-capture.tsx index 287f2fe85bb..1e4078cc2be 100644 --- a/app/javascript/packages/document-capture/components/acuant-capture.tsx +++ b/app/javascript/packages/document-capture/components/acuant-capture.tsx @@ -566,7 +566,7 @@ function AcuantCapture( {isMobile && hasCapture && allowUpload && - formatHTML(t('doc_auth.buttons.take_or_upload_picture'), { + formatHTML(t('doc_auth.buttons.take_or_upload_picture_html'), { 'lg-take-photo': () => null, 'lg-upload': ({ children }) => ( diff --git a/app/javascript/packages/document-capture/components/hybrid-doc-capture-warning.tsx b/app/javascript/packages/document-capture/components/hybrid-doc-capture-warning.tsx index 72f941d229e..f944aa59e11 100644 --- a/app/javascript/packages/document-capture/components/hybrid-doc-capture-warning.tsx +++ b/app/javascript/packages/document-capture/components/hybrid-doc-capture-warning.tsx @@ -28,10 +28,10 @@ function HybridDocCaptureWarning({ className = '' }: HybridDocCaptureWarningProp const appName = getConfigValue('appName'); const listHeadingText = t('doc_auth.hybrid_flow_warning.only_add_if_text'); - const ownAccountItemText = t('doc_auth.hybrid_flow_warning.only_add_own_account_html', { + const ownAccountItemText = t('doc_auth.hybrid_flow_warning.only_add_own_account', { app_name: appName, }); - const phoneVerifyItemText = t('doc_auth.hybrid_flow_warning.only_add_phone_verify_html', { + const phoneVerifyItemText = t('doc_auth.hybrid_flow_warning.only_add_phone_verify', { app_name: appName, }); let spServicesItemText; diff --git a/app/presenters/idv/cancellations_presenter.rb b/app/presenters/idv/cancellations_presenter.rb index e7a10fd3adc..0990eb9d8c6 100644 --- a/app/presenters/idv/cancellations_presenter.rb +++ b/app/presenters/idv/cancellations_presenter.rb @@ -26,7 +26,7 @@ def exit_description 'idv.cancel.description.exit.with_sp_html', app_name: APP_NAME, sp_name: sp_name, - account_page_link: link_to(t('idv.cancel.description.account_page'), account_path), + account_page_link_html: link_to(t('idv.cancel.description.account_page'), account_path), ) else t( diff --git a/app/presenters/idv/otp_verification_presenter.rb b/app/presenters/idv/otp_verification_presenter.rb index 998b805344c..0dc0c25afcf 100644 --- a/app/presenters/idv/otp_verification_presenter.rb +++ b/app/presenters/idv/otp_verification_presenter.rb @@ -13,7 +13,7 @@ def initialize(idv_session:) def phone_number_message t( "instructions.mfa.#{otp_delivery_preference}.number_message_html", - number: content_tag(:strong, phone_number), + number_html: content_tag(:strong, phone_number), expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end diff --git a/app/presenters/piv_cac_authentication_login_presenter.rb b/app/presenters/piv_cac_authentication_login_presenter.rb index 4df6326718e..a78cfdbb1e3 100644 --- a/app/presenters/piv_cac_authentication_login_presenter.rb +++ b/app/presenters/piv_cac_authentication_login_presenter.rb @@ -26,6 +26,6 @@ def heading end def info - t('instructions.mfa.piv_cac.sign_in', app_name: APP_NAME) + t('instructions.mfa.piv_cac.sign_in_html', app_name: APP_NAME) end end diff --git a/app/presenters/piv_cac_error_presenter.rb b/app/presenters/piv_cac_error_presenter.rb index d8eacd08ceb..f41c2388152 100644 --- a/app/presenters/piv_cac_error_presenter.rb +++ b/app/presenters/piv_cac_error_presenter.rb @@ -48,7 +48,7 @@ def heading def description case error when 'piv_cac.already_associated' - t('instructions.mfa.piv_cac.already_associated_html', try_again: try_again_link) + t('instructions.mfa.piv_cac.already_associated_html', try_again_html: try_again_link) when 'user.not_found' t( 'instructions.mfa.piv_cac.account_not_found_html', @@ -57,13 +57,13 @@ def description create_account: @view.link_to(t('links.create_account'), sign_up_email_url), ) when 'certificate.none' - t('instructions.mfa.piv_cac.no_certificate_html', try_again: try_again_link) + t('instructions.mfa.piv_cac.no_certificate_html', try_again_html: try_again_link) when 'certificate.not_auth_cert' - t('instructions.mfa.piv_cac.not_auth_cert_html', please_try_again: please_try_again_link) + t('instructions.mfa.piv_cac.not_auth_cert_html', please_try_again_html: please_try_again_link) when 'token.http_failure' t('instructions.mfa.piv_cac.http_failure') else - t('instructions.mfa.piv_cac.did_not_work_html', please_try_again: please_try_again_link) + t('instructions.mfa.piv_cac.did_not_work_html', please_try_again_html: please_try_again_link) end end diff --git a/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb b/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb index 79a87915b49..98f6fbcfb9a 100644 --- a/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb @@ -7,7 +7,7 @@ def header def help_text t( 'instructions.mfa.authenticator.confirm_code_html', - app_name: content_tag(:strong, APP_NAME), + app_name_html: content_tag(:strong, APP_NAME), ) end diff --git a/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb b/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb index 4d300a165ab..ecd2fb45be3 100644 --- a/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb @@ -18,7 +18,7 @@ def header def phone_number_message t( "instructions.mfa.#{otp_delivery_preference}.number_message_html", - number: content_tag(:strong, phone_number), + number_html: content_tag(:strong, phone_number), expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end diff --git a/app/presenters/two_factor_auth_code/piv_cac_authentication_presenter.rb b/app/presenters/two_factor_auth_code/piv_cac_authentication_presenter.rb index 84c22f3caaf..deaefaaf425 100644 --- a/app/presenters/two_factor_auth_code/piv_cac_authentication_presenter.rb +++ b/app/presenters/two_factor_auth_code/piv_cac_authentication_presenter.rb @@ -9,12 +9,12 @@ def header def piv_cac_help if service_provider_mfa_policy.phishing_resistant_required? && service_provider_mfa_policy.allow_user_to_switch_method? - t('instructions.mfa.piv_cac.confirm_piv_cac_or_aal3_html') + t('instructions.mfa.piv_cac.confirm_piv_cac_or_aal3') elsif service_provider_mfa_policy.phishing_resistant_required? || service_provider_mfa_policy.piv_cac_required? - t('instructions.mfa.piv_cac.confirm_piv_cac_only_html') + t('instructions.mfa.piv_cac.confirm_piv_cac_only') else - t('instructions.mfa.piv_cac.confirm_piv_cac_html') + t('instructions.mfa.piv_cac.confirm_piv_cac') end end diff --git a/app/presenters/two_factor_auth_code/webauthn_authentication_presenter.rb b/app/presenters/two_factor_auth_code/webauthn_authentication_presenter.rb index 43f214a69b7..62154540b0f 100644 --- a/app/presenters/two_factor_auth_code/webauthn_authentication_presenter.rb +++ b/app/presenters/two_factor_auth_code/webauthn_authentication_presenter.rb @@ -19,13 +19,13 @@ def initialize(data:, view:, service_provider:, remember_device_default: true, def webauthn_help if service_provider_mfa_policy.phishing_resistant_required? && service_provider_mfa_policy.allow_user_to_switch_method? - t('instructions.mfa.webauthn.confirm_webauthn_or_aal3_html') + t('instructions.mfa.webauthn.confirm_webauthn_or_aal3') elsif service_provider_mfa_policy.phishing_resistant_required? - t('instructions.mfa.webauthn.confirm_webauthn_only_html') + t('instructions.mfa.webauthn.confirm_webauthn_only') elsif platform_authenticator? - t('instructions.mfa.webauthn.confirm_webauthn_platform_html', app_name: APP_NAME) + t('instructions.mfa.webauthn.confirm_webauthn_platform', app_name: APP_NAME) else - t('instructions.mfa.webauthn.confirm_webauthn_html') + t('instructions.mfa.webauthn.confirm_webauthn') end end diff --git a/app/presenters/two_factor_login_options_presenter.rb b/app/presenters/two_factor_login_options_presenter.rb index 3b8dde9a926..c46221f3cbe 100644 --- a/app/presenters/two_factor_login_options_presenter.rb +++ b/app/presenters/two_factor_login_options_presenter.rb @@ -76,7 +76,7 @@ def first_enabled_option_index def account_reset_link t( 'two_factor_authentication.account_reset.text_html', - link: @view.link_to( + link_html: @view.link_to( t('two_factor_authentication.account_reset.link'), account_reset_url(locale: LinkLocaleResolver.locale), ), @@ -88,12 +88,15 @@ def account_reset_url(locale:) end def account_reset_cancel_link - t( - 'two_factor_authentication.account_reset.pending_html', - cancel_link: @view.link_to( - t('two_factor_authentication.account_reset.cancel_link'), - account_reset_cancel_url(token: account_reset_token), - ), + safe_join( + [ + t('two_factor_authentication.account_reset.pending'), + @view.link_to( + t('two_factor_authentication.account_reset.cancel_link'), + account_reset_cancel_url(token: account_reset_token), + ), + ], + ' ', ) end diff --git a/app/views/account_reset/confirm_delete_account/show.html.erb b/app/views/account_reset/confirm_delete_account/show.html.erb index e37d4f48331..e313062f73c 100644 --- a/app/views/account_reset/confirm_delete_account/show.html.erb +++ b/app/views/account_reset/confirm_delete_account/show.html.erb @@ -9,7 +9,7 @@

<%= t( 'account_reset.confirm_delete_account.cta_html', - link: link_to( + link_html: link_to( t('account_reset.confirm_delete_account.link_text'), sign_up_email_path, ), diff --git a/app/views/accounts/_identity_item.html.erb b/app/views/accounts/_identity_item.html.erb index b4722b99094..953bd46d01c 100644 --- a/app/views/accounts/_identity_item.html.erb +++ b/app/views/accounts/_identity_item.html.erb @@ -3,7 +3,7 @@ <% if event.return_to_sp_url.present? %> <%= t( 'event_types.authenticated_at_html', - service_provider_link: link_to(event.display_name, event.return_to_sp_url), + service_provider_link_html: link_to(event.display_name, event.return_to_sp_url), ) %> <% else %> <%= t('event_types.authenticated_at', service_provider: event.display_name) %> diff --git a/app/views/forgot_password/show.html.erb b/app/views/forgot_password/show.html.erb index c22a6d119d0..6ebf11bfa79 100644 --- a/app/views/forgot_password/show.html.erb +++ b/app/views/forgot_password/show.html.erb @@ -24,10 +24,11 @@

<%= t('notices.forgot_password.no_email_sent_explanation_start') %> <%= f.button :button, t('links.resend'), class: 'usa-button--unstyled margin-left-05' %>

- <% link = link_to( - t('notices.forgot_password.use_diff_email.link'), - sign_up_email_path, - ) %> -

<%= t('notices.forgot_password.use_diff_email.text_html', link: link) %>

+

+ <%= t( + 'notices.forgot_password.use_diff_email.text_html', + link_html: link_to(t('notices.forgot_password.use_diff_email.link'), sign_up_email_path), + ) %> +

<%= t('instructions.forgot_password.close_window') %>

<% end %> diff --git a/app/views/idv/activated.html.erb b/app/views/idv/activated.html.erb index c2647482e2c..9072c171c89 100644 --- a/app/views/idv/activated.html.erb +++ b/app/views/idv/activated.html.erb @@ -5,6 +5,6 @@

<%= t( 'idv.messages.activated_html', - link: link_to(t('idv.messages.activated_link'), MarketingSite.contact_url), + link_html: link_to(t('idv.messages.activated_link'), MarketingSite.contact_url), ) %>

diff --git a/app/views/idv/gpo_verify/index.html.erb b/app/views/idv/gpo_verify/index.html.erb index 40612a17bb5..c06ff2a0906 100644 --- a/app/views/idv/gpo_verify/index.html.erb +++ b/app/views/idv/gpo_verify/index.html.erb @@ -22,7 +22,7 @@ <% end %> <%= render PageHeadingComponent.new.with_content(t('forms.verify_profile.welcome_back')) %> -<%= sanitize t('forms.verify_profile.welcome_back_description'), tags: %w[p strong] %> +<%= t('forms.verify_profile.welcome_back_description_html') %>

<%= t('forms.verify_profile.title') %>

diff --git a/app/views/idv/in_person/ready_to_verify/show.html.erb b/app/views/idv/in_person/ready_to_verify/show.html.erb index cb8a93c5fe7..778234e56ae 100644 --- a/app/views/idv/in_person/ready_to_verify/show.html.erb +++ b/app/views/idv/in_person/ready_to_verify/show.html.erb @@ -115,7 +115,7 @@ <%= 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( + link_html: link_to( t( 'in_person_proofing.body.barcode.return_to_partner_link', sp_name: @presenter.sp_name, diff --git a/app/views/idv/in_person/verify_info/show.html.erb b/app/views/idv/in_person/verify_info/show.html.erb index b2c0c0f82ed..ea5ae8073c4 100644 --- a/app/views/idv/in_person/verify_info/show.html.erb +++ b/app/views/idv/in_person/verify_info/show.html.erb @@ -26,7 +26,7 @@ locals: ) do %> <%= t( 'doc_auth.headings.capture_scan_warning_html', - link: link_to( + link_html: link_to( t('doc_auth.headings.capture_scan_warning_link'), idv_hybrid_handoff_url(redo: true), 'aria-label': t('doc_auth.headings.capture_scan_warning_link'), diff --git a/app/views/idv/please_call/show.html.erb b/app/views/idv/please_call/show.html.erb index 2f0cd590242..1172c70fe15 100644 --- a/app/views/idv/please_call/show.html.erb +++ b/app/views/idv/please_call/show.html.erb @@ -12,9 +12,9 @@ heading: t('idv.failure.setup.heading'), ) do %>

- <%= t('idv.failure.setup.fail_date_html', date: I18n.l(@call_by_date, format: I18n.t('time.formats.event_date'))) %> + <%= t('idv.failure.setup.fail_date_html', date_html: I18n.l(@call_by_date, format: I18n.t('time.formats.event_date'))) %>

- <%= t('idv.failure.setup.fail_html', support_code: IdentityConfig.store.lexisnexis_threatmetrix_support_code, contact_number: IdentityConfig.store.idv_contact_phone_number) %> + <%= t('idv.failure.setup.fail', support_code: IdentityConfig.store.lexisnexis_threatmetrix_support_code, contact_number: IdentityConfig.store.idv_contact_phone_number) %>

<% end %> diff --git a/app/views/idv/session_errors/exception.html.erb b/app/views/idv/session_errors/exception.html.erb index bb383d220eb..57296187ddc 100644 --- a/app/views/idv/session_errors/exception.html.erb +++ b/app/views/idv/session_errors/exception.html.erb @@ -25,7 +25,7 @@

<%= t( 'idv.failure.exceptions.text_html', - link: link_to(t('idv.failure.exceptions.link'), MarketingSite.contact_url), + link_html: link_to(t('idv.failure.exceptions.link'), MarketingSite.contact_url), ) %>

<% end %> diff --git a/app/views/idv/unavailable/show.html.erb b/app/views/idv/unavailable/show.html.erb index c385a886380..9815916580a 100644 --- a/app/views/idv/unavailable/show.html.erb +++ b/app/views/idv/unavailable/show.html.erb @@ -20,7 +20,7 @@ <%= t( 'idv.unavailable.next_steps_html', app_name: APP_NAME, - status_page_link: new_tab_link_to( + status_page_link_html: new_tab_link_to( t('idv.unavailable.status_page_link'), StatusPage.base_url, ), diff --git a/app/views/idv/verify_info/show.html.erb b/app/views/idv/verify_info/show.html.erb index eab7ca997f5..f9064ceb0e6 100644 --- a/app/views/idv/verify_info/show.html.erb +++ b/app/views/idv/verify_info/show.html.erb @@ -26,7 +26,7 @@ locals: ) do %> <%= t( 'doc_auth.headings.capture_scan_warning_html', - link: link_to( + link_html: link_to( t('doc_auth.headings.capture_scan_warning_link'), idv_hybrid_handoff_url(redo: true), 'aria-label': t('doc_auth.headings.capture_scan_warning_link'), diff --git a/app/views/idv/welcome/show.html.erb b/app/views/idv/welcome/show.html.erb index 771cb8c2f0a..4710132922a 100644 --- a/app/views/idv/welcome/show.html.erb +++ b/app/views/idv/welcome/show.html.erb @@ -26,7 +26,7 @@ <%= render PageHeadingComponent.new.with_content(t('doc_auth.headings.welcome')) %>

- <%= t('doc_auth.info.welcome_html', sp_name: decorated_session.sp_name || t('doc_auth.info.no_sp_name')) %> + <%= t('doc_auth.info.welcome', sp_name: decorated_session.sp_name || t('doc_auth.info.no_sp_name')) %>

<%= t('doc_auth.instructions.welcome') %>

diff --git a/app/views/partials/personal_key/_key.html.erb b/app/views/partials/personal_key/_key.html.erb index d8a62da1b9a..78ca92fc4d4 100644 --- a/app/views/partials/personal_key/_key.html.erb +++ b/app/views/partials/personal_key/_key.html.erb @@ -16,12 +16,14 @@ <% if local_assigns[:personal_key_generated_at].present? %> <%= t( 'users.personal_key.generated_on_html', - date: content_tag(:strong, render(TimeComponent.new(time: personal_key_generated_at))), + date_html: content_tag( + :strong, render(TimeComponent.new(time: personal_key_generated_at)) + ), ) %> <% else %> <%= t( 'users.personal_key.generated_on_html', - date: content_tag(:strong, render(TimeComponent.new(time: Time.zone.today))), + date_html: content_tag(:strong, render(TimeComponent.new(time: Time.zone.today))), ) %> <% end %>

diff --git a/app/views/session_timeout/_warning.html.erb b/app/views/session_timeout/_warning.html.erb index c4871223b5d..96ab50b783b 100644 --- a/app/views/session_timeout/_warning.html.erb +++ b/app/views/session_timeout/_warning.html.erb @@ -13,7 +13,7 @@ # i18n-tasks-use t('notices.timeout_warning.partially_signed_in.message_html') 'message_html', scope: modal_presenter.translation_scope, - time_left_in_session: render( + time_left_in_session_html: render( CountdownComponent.new( expiration: Time.zone.now, start_immediately: false, @@ -27,7 +27,7 @@ # i18n-tasks-use t('notices.timeout_warning.partially_signed_in.live_region_message_html') 'live_region_message_html', scope: modal_presenter.translation_scope, - time_left_in_session: render( + time_left_in_session_html: render( CountdownComponent.new( expiration: Time.zone.now, update_interval: 30.seconds, diff --git a/app/views/shared/_recaptcha_disclosure.html.erb b/app/views/shared/_recaptcha_disclosure.html.erb index 4b20ccc1b69..af839e11491 100644 --- a/app/views/shared/_recaptcha_disclosure.html.erb +++ b/app/views/shared/_recaptcha_disclosure.html.erb @@ -2,8 +2,8 @@ <%= t( 'two_factor_authentication.recaptcha.disclosure_statement_html', app_name: APP_NAME, - google_policy_link: new_tab_link_to(t('two_factor_authentication.recaptcha.google_policy_link'), GooglePolicySite.privacy_url), - google_tos_link: new_tab_link_to(t('two_factor_authentication.recaptcha.google_tos_link'), GooglePolicySite.terms_url), - login_tos_link: new_tab_link_to(t('two_factor_authentication.recaptcha.login_tos_link'), MarketingSite.rules_of_use_url), + google_policy_link_html: new_tab_link_to(t('two_factor_authentication.recaptcha.google_policy_link'), GooglePolicySite.privacy_url), + google_tos_link_html: new_tab_link_to(t('two_factor_authentication.recaptcha.google_tos_link'), GooglePolicySite.terms_url), + login_tos_link_html: new_tab_link_to(t('two_factor_authentication.recaptcha.login_tos_link'), MarketingSite.rules_of_use_url), ) %>

\ No newline at end of file diff --git a/app/views/shared/_ssn_field.html.erb b/app/views/shared/_ssn_field.html.erb index 44afe95439f..f38d714f371 100644 --- a/app/views/shared/_ssn_field.html.erb +++ b/app/views/shared/_ssn_field.html.erb @@ -10,7 +10,7 @@ locals: field_options: { name: :ssn, as: :password, - label: t('idv.form.ssn_label_html'), + label: t('idv.form.ssn_label'), hint: t('forms.example') + ' 123-45-6789', required: true, pattern: '^\d{3}-?\d{2}-?\d{4}$', diff --git a/app/views/sign_up/emails/show.html.erb b/app/views/sign_up/emails/show.html.erb index d091a907530..033e2b1948d 100644 --- a/app/views/sign_up/emails/show.html.erb +++ b/app/views/sign_up/emails/show.html.erb @@ -27,8 +27,12 @@

<%= t('notices.signed_up_but_unconfirmed.no_email_sent_explanation_start') %> <%= f.button :button, t('links.resend'), class: 'usa-button--unstyled margin-left-05' %>

- <% link = link_to(t('notices.use_diff_email.link'), sign_up_email_path) %> -

<%= t('notices.use_diff_email.text_html', link: link) %>

+

+ <%= t( + 'notices.use_diff_email.text_html', + link_html: link_to(t('notices.use_diff_email.link'), sign_up_email_path), + ) %> +

<%= t('devise.registrations.close_window') %>

<% if FeatureManagement.enable_load_testing_mode? %> diff --git a/app/views/two_factor_authentication/sms_opt_in/error.html.erb b/app/views/two_factor_authentication/sms_opt_in/error.html.erb index fa8331cb50b..85164530e04 100644 --- a/app/views/two_factor_authentication/sms_opt_in/error.html.erb +++ b/app/views/two_factor_authentication/sms_opt_in/error.html.erb @@ -5,7 +5,7 @@

<%= t( 'two_factor_authentication.opt_in.opted_out_last_30d_html', - phone_number: content_tag(:strong, @phone_configuration.masked_phone), + phone_number_html: content_tag(:strong, @phone_configuration.masked_phone), ) %>

diff --git a/app/views/two_factor_authentication/sms_opt_in/new.html.erb b/app/views/two_factor_authentication/sms_opt_in/new.html.erb index b2cd656a535..5996f678d4a 100644 --- a/app/views/two_factor_authentication/sms_opt_in/new.html.erb +++ b/app/views/two_factor_authentication/sms_opt_in/new.html.erb @@ -5,7 +5,7 @@

<%= t( 'two_factor_authentication.opt_in.opted_out_html', - phone_number: content_tag(:strong, @phone_configuration.masked_phone), + phone_number_html: content_tag(:strong, @phone_configuration.masked_phone), ) %>

diff --git a/app/views/user_mailer/account_rejected.html.erb b/app/views/user_mailer/account_rejected.html.erb index 28383b5c8a4..eacabbf493d 100644 --- a/app/views/user_mailer/account_rejected.html.erb +++ b/app/views/user_mailer/account_rejected.html.erb @@ -1,8 +1,5 @@

- <%= t( - 'user_mailer.account_rejected.intro_html', - app_name: APP_NAME, - ) %> + <%= t('user_mailer.account_rejected.intro', app_name: APP_NAME) %>

diff --git a/app/views/user_mailer/account_reset_cancel.html.erb b/app/views/user_mailer/account_reset_cancel.html.erb index 7c194dfdd6e..9a98ee49458 100644 --- a/app/views/user_mailer/account_reset_cancel.html.erb +++ b/app/views/user_mailer/account_reset_cancel.html.erb @@ -1,5 +1,8 @@

- <%= t('user_mailer.account_reset_cancel.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %> + <%= t( + 'user_mailer.account_reset_cancel.intro_html', + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + ) %>

diff --git a/app/views/user_mailer/account_reset_complete.html.erb b/app/views/user_mailer/account_reset_complete.html.erb index 75fc5ee4ac6..54ee341bb63 100644 --- a/app/views/user_mailer/account_reset_complete.html.erb +++ b/app/views/user_mailer/account_reset_complete.html.erb @@ -1,5 +1,5 @@

- <%= t('user_mailer.account_reset_complete.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %> + <%= t('user_mailer.account_reset_complete.intro_html', app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %>

diff --git a/app/views/user_mailer/account_reset_granted.html.erb b/app/views/user_mailer/account_reset_granted.html.erb index e3b789c6be9..d4406c1cec3 100644 --- a/app/views/user_mailer/account_reset_granted.html.erb +++ b/app/views/user_mailer/account_reset_granted.html.erb @@ -52,7 +52,7 @@

<%= t( 'user_mailer.account_reset_granted.help_html', - cancel_account_reset: link_to( + cancel_account_reset_html: link_to( t('user_mailer.account_reset_granted.cancel_link_text'), account_reset_cancel_url(token: @token), ), diff --git a/app/views/user_mailer/account_verified.html.erb b/app/views/user_mailer/account_verified.html.erb index 35c80c349d1..dff3fe44a73 100644 --- a/app/views/user_mailer/account_verified.html.erb +++ b/app/views/user_mailer/account_verified.html.erb @@ -4,11 +4,11 @@ sp_name: @sp_name, app_name: APP_NAME, date: @date, - change_password_link: link_to( + change_password_link_html: link_to( t('user_mailer.account_verified.change_password_link'), new_user_password_url, ), - contact_link: link_to(t('user_mailer.account_verified.contact_link'), MarketingSite.contact_url), + contact_link_html: link_to(t('user_mailer.account_verified.contact_link'), MarketingSite.contact_url), ) %>

diff --git a/app/views/user_mailer/add_email_associated_with_another_account.html.erb b/app/views/user_mailer/add_email_associated_with_another_account.html.erb index 28f0ec3df65..2b16ca5ef75 100644 --- a/app/views/user_mailer/add_email_associated_with_another_account.html.erb +++ b/app/views/user_mailer/add_email_associated_with_another_account.html.erb @@ -1,7 +1,7 @@

<%= t( 'user_mailer.add_email_associated_with_another_account.intro_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), ) %>

@@ -53,15 +53,15 @@

<%= t( 'user_mailer.add_email_associated_with_another_account.reset_password_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), ) %>

<%= t( 'user_mailer.add_email_associated_with_another_account.help_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), - help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), - contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + help_link_html: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), + contact_link_html: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), ) %>

diff --git a/app/views/user_mailer/email_deleted.html.erb b/app/views/user_mailer/email_deleted.html.erb index b882996de4e..508171dffcb 100644 --- a/app/views/user_mailer/email_deleted.html.erb +++ b/app/views/user_mailer/email_deleted.html.erb @@ -18,8 +18,8 @@

<%= t( '.help_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), - help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), - contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + help_link_html: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), + contact_link_html: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), ) %>

diff --git a/app/views/user_mailer/letter_reminder.html.erb b/app/views/user_mailer/letter_reminder.html.erb index d9559c36516..4d1a82d6863 100644 --- a/app/views/user_mailer/letter_reminder.html.erb +++ b/app/views/user_mailer/letter_reminder.html.erb @@ -1,5 +1,5 @@

- <%= t('user_mailer.letter_reminder.info_html', link: link_to(APP_NAME, root_url)) %> + <%= t('user_mailer.letter_reminder.info_html', link_html: link_to(APP_NAME, root_url)) %>

diff --git a/app/views/user_mailer/new_device_sign_in.html.erb b/app/views/user_mailer/new_device_sign_in.html.erb index 1c0b6cf9617..d681881cb4e 100644 --- a/app/views/user_mailer/new_device_sign_in.html.erb +++ b/app/views/user_mailer/new_device_sign_in.html.erb @@ -28,12 +28,12 @@

<%= t( 'user_mailer.new_device_sign_in.help_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), - disavowal_link: link_to( + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + disavowal_link_html: link_to( t('.disavowal_link'), event_disavowal_url(disavowal_token: @disavowal_token), ), - help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), - contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), + help_link_html: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), + contact_link_html: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), ) %>

diff --git a/app/views/user_mailer/password_changed.html.erb b/app/views/user_mailer/password_changed.html.erb index d5d84cc6dc6..0048ab69e9b 100644 --- a/app/views/user_mailer/password_changed.html.erb +++ b/app/views/user_mailer/password_changed.html.erb @@ -1,5 +1,5 @@

- <%= t('user_mailer.password_changed.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %> + <%= t('user_mailer.password_changed.intro_html', app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %>

@@ -23,12 +23,12 @@

<%= t( 'user_mailer.password_changed.help_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), - disavowal_link: link_to( + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + disavowal_link_html: link_to( t('.disavowal_link'), event_disavowal_url(disavowal_token: @disavowal_token), ), - help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), - contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), + help_link_html: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), + contact_link_html: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), ) %>

diff --git a/app/views/user_mailer/phone_added.html.erb b/app/views/user_mailer/phone_added.html.erb index 56e7603981a..0bb688277a7 100644 --- a/app/views/user_mailer/phone_added.html.erb +++ b/app/views/user_mailer/phone_added.html.erb @@ -20,8 +20,8 @@

- <%= raw t( - '.help', disavowal_link: link_to( + <%= t( + '.help_html', disavowal_link_html: link_to( t('.disavowal_link'), event_disavowal_url(disavowal_token: @disavowal_token), ) diff --git a/app/views/user_mailer/signup_with_your_email.html.erb b/app/views/user_mailer/signup_with_your_email.html.erb index 04c957c70a5..1c4e8097d57 100644 --- a/app/views/user_mailer/signup_with_your_email.html.erb +++ b/app/views/user_mailer/signup_with_your_email.html.erb @@ -1,5 +1,5 @@

- <%= t('user_mailer.signup_with_your_email.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %> + <%= t('user_mailer.signup_with_your_email.intro_html', app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %>

@@ -51,15 +51,15 @@

<%= t( 'user_mailer.signup_with_your_email.reset_password_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), ) %>

<%= t( 'user_mailer.signup_with_your_email.help_html', - app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), - help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), - contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), + app_name_html: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), + help_link_html: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), + contact_link_html: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url), ) %>

diff --git a/app/views/users/emails/verify.html.erb b/app/views/users/emails/verify.html.erb index 5cb2de1f1ce..20138508ef6 100644 --- a/app/views/users/emails/verify.html.erb +++ b/app/views/users/emails/verify.html.erb @@ -22,9 +22,7 @@ <%= t('notices.signed_up_and_confirmed.no_email_sent_explanation_start') %> <%= button_to(add_email_resend_path, method: :post, class: 'usa-button usa-button--unstyled', form_class: 'display-inline-block padding-left-1') { t('links.resend') } %> -

<% link = link_to(t('notices.use_diff_email.link'), add_email_path) %>

- -

<%= t('notices.use_diff_email.text_html', link: link) %>

+

<%= t('notices.use_diff_email.text_html', link_html: link_to(t('notices.use_diff_email.link'), add_email_path)) %>

<%= t('devise.registrations.close_window') %>

<% if FeatureManagement.enable_load_testing_mode? %> diff --git a/app/views/users/piv_cac_login/new.html.erb b/app/views/users/piv_cac_login/new.html.erb index a89e6d21910..f03a88adecc 100644 --- a/app/views/users/piv_cac_login/new.html.erb +++ b/app/views/users/piv_cac_login/new.html.erb @@ -3,7 +3,7 @@ <%= render PageHeadingComponent.new.with_content(@presenter.heading) %>

- <%= raw @presenter.info %> + <%= @presenter.info %>

<%= render SpinnerButtonComponent.new( diff --git a/app/views/users/rules_of_use/new.html.erb b/app/views/users/rules_of_use/new.html.erb index fa949835c6a..b4a16bd29ed 100644 --- a/app/views/users/rules_of_use/new.html.erb +++ b/app/views/users/rules_of_use/new.html.erb @@ -5,7 +5,7 @@

<%= t( 'users.rules_of_use.overview_html', - link: new_tab_link_to( + link_html: new_tab_link_to( t('titles.rules_of_use'), MarketingSite.rules_of_use_url, ), diff --git a/app/views/users/service_provider_revoke/show.html.erb b/app/views/users/service_provider_revoke/show.html.erb index 8e2d30e2943..ddb2e47ede1 100644 --- a/app/views/users/service_provider_revoke/show.html.erb +++ b/app/views/users/service_provider_revoke/show.html.erb @@ -5,7 +5,7 @@

<%= t( 'account.revoke_consent.longer_description_html', - service_provider: content_tag(:b, @service_provider.friendly_name), + service_provider_html: content_tag(:b, @service_provider.friendly_name), ) %>

diff --git a/app/views/users/totp_setup/new.html.erb b/app/views/users/totp_setup/new.html.erb index ad656b932cb..721ecc8166d 100644 --- a/app/views/users/totp_setup/new.html.erb +++ b/app/views/users/totp_setup/new.html.erb @@ -3,10 +3,8 @@ <%= render PageHeadingComponent.new.with_content(t('headings.totp_setup.new')) %>

- <%= t( - 'forms.totp_setup.totp_intro_html', - link: new_tab_link_to(t('links.what_is_totp'), MarketingSite.help_authentication_app_url), - ) %> + <%= t('forms.totp_setup.totp_intro') %> + <%= new_tab_link_to(t('links.what_is_totp'), MarketingSite.help_authentication_app_url) %>

<%= simple_form_for('', method: :patch, html: { class: 'margin-bottom-4' }) do |f| %> diff --git a/config/locales/account/en.yml b/config/locales/account/en.yml index 9b7313a98cb..daa84b8a2cd 100644 --- a/config/locales/account/en.yml +++ b/config/locales/account/en.yml @@ -114,9 +114,10 @@ en: revoke_consent: link_title: Disconnect longer_description_html: Your information will no longer be shared with - %{service_provider}. To access %{service_provider} in the future, you - must give your consent to share your information. You can give consent - by going to the %{service_provider} site and logging in. + %{service_provider_html}. To access %{service_provider_html} in the + future, you must give your consent to share your information. You can + give consent by going to the %{service_provider_html} site and logging + in. security: link: Learn more at the Help Center text: Your profile information is locked for your security. diff --git a/config/locales/account/es.yml b/config/locales/account/es.yml index aab4476a348..86762885259 100644 --- a/config/locales/account/es.yml +++ b/config/locales/account/es.yml @@ -115,9 +115,10 @@ es: revoke_consent: link_title: Desconectar longer_description_html: Su información ya no se compartirá con - %{service_provider}. Para acceder a %{service_provider} en el futuro, - debe dar su consentimiento para compartir su información. Puede dar su - consentimiento yendo al sitio %{service_provider} e iniciando sesión. + %{service_provider_html}. Para acceder a %{service_provider_html} en el + futuro, debe dar su consentimiento para compartir su información. Puede + dar su consentimiento yendo al sitio %{service_provider_html} e + iniciando sesión. security: link: Obtenga más información en el Centro de ayuda text: Para su seguridad, la información de su perfil está bloqueada. diff --git a/config/locales/account/fr.yml b/config/locales/account/fr.yml index 4c23df35007..51ae5a45cc5 100644 --- a/config/locales/account/fr.yml +++ b/config/locales/account/fr.yml @@ -124,10 +124,10 @@ fr: revoke_consent: link_title: Déconnecter longer_description_html: Vos informations ne seront plus partagées avec - %{service_provider}. Pour accéder à %{service_provider} à l’avenir, vous - devez donner votre consentement pour partager vos informations. Vous - pouvez donner votre consentement en allant sur le site - %{service_provider} et en vous connectant. + %{service_provider_html}. Pour accéder à %{service_provider_html} à + l’avenir, vous devez donner votre consentement pour partager vos + informations. Vous pouvez donner votre consentement en allant sur le + site %{service_provider_html} et en vous connectant. security: link: En apprendre davantage dans le Centre d’aide text: L’information de votre profil est verrouillée pour votre sécurité. diff --git a/config/locales/account_reset/en.yml b/config/locales/account_reset/en.yml index 7d34bcc9a83..7e44407eb36 100644 --- a/config/locales/account_reset/en.yml +++ b/config/locales/account_reset/en.yml @@ -7,7 +7,7 @@ en: cancel_button: Cancel delete account title: Cancel delete account confirm_delete_account: - cta_html: You may %{link} or close this window if you’re done. + cta_html: You may %{link_html} or close this window if you’re done. info_html: The account for %{email} has been deleted. We sent an email confirmation of the account deletion. link_text: create a new account diff --git a/config/locales/account_reset/es.yml b/config/locales/account_reset/es.yml index 25e4f875dc3..6b31344231c 100644 --- a/config/locales/account_reset/es.yml +++ b/config/locales/account_reset/es.yml @@ -7,7 +7,7 @@ es: cancel_button: Cancelar la cuenta eliminada title: Cancelar la cuenta eliminada confirm_delete_account: - cta_html: Puede %{link} o cierra esta ventana si ya terminaste. + cta_html: Puede %{link_html} o cierra esta ventana si ya terminaste. info_html: La cuenta para %{email} ha sido eliminada. Nosotros enviamos una confirmación por correo electrónico de la eliminación de la cuenta. diff --git a/config/locales/account_reset/fr.yml b/config/locales/account_reset/fr.yml index 32fbbdaa4ec..49afdbe4c53 100644 --- a/config/locales/account_reset/fr.yml +++ b/config/locales/account_reset/fr.yml @@ -7,7 +7,7 @@ fr: cancel_button: Annuler supprimer un compte title: Annuler supprimer un compte confirm_delete_account: - cta_html: Vous pouvez %{link} ou fermer cette fenêtre si vous avez terminé. + cta_html: Vous pouvez %{link_html} ou fermer cette fenêtre si vous avez terminé. info_html: Le compte pour %{email} a été supprimé. Nous avons envoyé un email de confirmation de la suppression du compte. link_text: créer un nouveau compte diff --git a/config/locales/devise/en.yml b/config/locales/devise/en.yml index e7e4993811f..905812cf78b 100644 --- a/config/locales/devise/en.yml +++ b/config/locales/devise/en.yml @@ -15,11 +15,11 @@ en: failure: already_authenticated: '' inactive: Your account hasn’t been activated. - invalid_html: The email or password you’ve entered is wrong. Try %{link}. + invalid_html: The email or password you’ve entered is wrong. Try %{link_html}. invalid_link_text: resetting your password last_attempt: You have one more attempt before your account is locked. locked: Your account has been locked. - not_found_in_database_html: The email or password you’ve entered is wrong. Try %{link}. + not_found_in_database_html: The email or password you’ve entered is wrong. Try %{link_html}. not_found_in_database_link_text: resetting your password session_limited: Your login credentials were used in another browser. Please sign in again to continue in this browser. @@ -32,9 +32,9 @@ en: passwords: choose_new_password: Choose a new password. invalid_token: The reset password token is invalid. Try again. - no_token: To reset your password please use the link in the Password - Reset email you received. If you’re pasting the link into your - browser, please make sure you’ve pasted the entire link. + no_token: To reset your password please use the link in the Password Reset email + you received. If you’re pasting the link into your browser, please make + sure you’ve pasted the entire link. send_instructions: You will receive an email with instructions on how to reset your password in a few minutes. send_paranoid_instructions: You will receive an email with instructions on how diff --git a/config/locales/devise/es.yml b/config/locales/devise/es.yml index 42713eb4868..8d75ecdfb40 100644 --- a/config/locales/devise/es.yml +++ b/config/locales/devise/es.yml @@ -16,11 +16,13 @@ es: failure: already_authenticated: '' inactive: Su cuenta aún no está activada. - invalid_html: El email o la contraseña que ingresó son incorrectos. Intente %{link}. + invalid_html: El email o la contraseña que ingresó son incorrectos. Intente + %{link_html}. invalid_link_text: restablecer su contraseña last_attempt: Tiene un intento más antes de que su cuenta esté bloqueada. locked: Su cuenta está bloqueada. - not_found_in_database_html: El email o la contraseña que ingresó son incorrectos. Intente %{link}. + not_found_in_database_html: El email o la contraseña que ingresó son + incorrectos. Intente %{link_html}. not_found_in_database_link_text: restablecer su contraseña session_limited: Sus credenciales para iniciar una sesión se utilizaron en otro navegador. Inicie una sesión nueva para continuar en este navegador. diff --git a/config/locales/devise/fr.yml b/config/locales/devise/fr.yml index 3e327288ea2..c8d7d9daaef 100644 --- a/config/locales/devise/fr.yml +++ b/config/locales/devise/fr.yml @@ -17,12 +17,12 @@ fr: already_authenticated: '' inactive: Votre compte n’est pas encore activé. invalid_html: L’adresse courriel ou le mot de passe que vous avez entré est - erroné. Essayez de %{link}. + erroné. Essayez de %{link_html}. invalid_link_text: réinitialiser votre mot de passe last_attempt: Il vous reste un essai avant que votre compte ne soit verrouillé. locked: Votre compte est maintenant verrouillé. not_found_in_database_html: L’adresse courriel ou le mot de passe que vous avez - entré est erroné. Essayez de %{link}. + entré est erroné. Essayez de %{link_html}. not_found_in_database_link_text: réinitialiser votre mot de passe session_limited: Vos authentifiants ont été utilisés dans un autre navigateur. Veuillez vous connecter de nouveau pour continuer avec ce navigateur. diff --git a/config/locales/doc_auth/en.yml b/config/locales/doc_auth/en.yml index ecdd6b9a2aa..c91745ff7db 100644 --- a/config/locales/doc_auth/en.yml +++ b/config/locales/doc_auth/en.yml @@ -8,7 +8,7 @@ en: buttons: add_new_photos: Add new photos continue: Continue - take_or_upload_picture: 'Take photo or + take_or_upload_picture_html: 'Take photo or Upload photo' take_picture: Take photo take_picture_retry: Retake photo @@ -104,7 +104,8 @@ en: back: Back capture_complete: We verified your 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_html} 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 @@ -129,8 +130,8 @@ en: services. explanation_non_sp_html: You’re using %{app_name} to verify your identity. only_add_if_text: 'ONLY ADD YOUR ID IF:' - only_add_own_account_html: You are using your own %{app_name} account - only_add_phone_verify_html: You asked %{app_name} to verify your ID using your phone + only_add_own_account: You are using your own %{app_name} account + only_add_phone_verify: You asked %{app_name} to verify your ID using your phone only_add_sp_services_html: You are trying to access %{service_provider_name} services info: @@ -175,8 +176,8 @@ en: camera and a web browser. verify_identity: We’ll ask for your personal information to verify your identity against public records. - welcome_html: '%{sp_name} needs to make sure you are you — not someone - pretending to be you.' + welcome: '%{sp_name} needs to make sure you are you — not someone pretending to + be you.' you_entered: 'You entered:' instructions: bullet1: State‑issued ID diff --git a/config/locales/doc_auth/es.yml b/config/locales/doc_auth/es.yml index 177e403e01e..c741fd81ca6 100644 --- a/config/locales/doc_auth/es.yml +++ b/config/locales/doc_auth/es.yml @@ -8,7 +8,7 @@ es: buttons: add_new_photos: Añadir nuevas fotos continue: Continuar - take_or_upload_picture: 'Toma una foto o + take_or_upload_picture_html: 'Toma una foto o Sube una foto' take_picture: Tomar una foto take_picture_retry: Retirar la foto @@ -128,8 +128,8 @@ es: back: Parte Trasera capture_complete: Verificamos su identificación capture_scan_warning_html: No pudimos leer el código de barras en su ID. Si la - información que aparece a continuación es incorrecta, por favor, %{link} - de su ID emitido por el estado. + información que aparece a continuación es incorrecta, por favor, + %{link_html} de su ID emitido por el estado. capture_scan_warning_link: suba nuevas fotos capture_troubleshooting_tips: '¿Tiene problemas para agregar su identificación emitida por el estado?' document_capture: Añada su documento de identidad expedido por el estado @@ -155,9 +155,9 @@ es: explanation_non_sp_html: Usted está utilizando %{app_name} para verificar su identidad only_add_if_text: 'SOLO AGREGUE SU IDENTIFICACIÓN SI:' - only_add_own_account_html: Está usando su propia cuenta de %{app_name} - only_add_phone_verify_html: Usted solicitó a %{app_name} que verificara su - identidad a través de su teléfono + only_add_own_account: Está usando su propia cuenta de %{app_name} + only_add_phone_verify: Usted solicitó a %{app_name} que verificara su identidad + a través de su teléfono only_add_sp_services_html: Está tratando de acceder a los servicios %{service_provider_name} info: @@ -208,8 +208,8 @@ es: tener una cámara y un navegador web. verify_identity: Le preguntaremos sus datos personales para verificar su identidad comparándola con los registros públicos. - welcome_html: '%{sp_name} necesita asegurarse de que es usted y no es alguien - que se hace pasar por usted.' + welcome: '%{sp_name} necesita asegurarse de que es usted y no es alguien que se + hace pasar por usted.' you_entered: 'Ud. entregó:' instructions: bullet1: Documento de identidad emitido por el estado. diff --git a/config/locales/doc_auth/fr.yml b/config/locales/doc_auth/fr.yml index a6271df9141..24ff5d1f60a 100644 --- a/config/locales/doc_auth/fr.yml +++ b/config/locales/doc_auth/fr.yml @@ -8,8 +8,8 @@ fr: buttons: add_new_photos: Ajoutez de nouvelles photos continue: Continuer - take_or_upload_picture: 'Prendre une photo ou - Télécharger une photo' + take_or_upload_picture_html: 'Prendre une photo + ou Télécharger une photo' take_picture: Prendre une photo take_picture_retry: Reprendre la photo upload_picture: Télécharger une photo @@ -135,7 +135,7 @@ fr: capture_complete: Nous avons vérifié votre document d’identité capture_scan_warning_html: Nous n’avons pas pu lire le code-barres de votre pièce d’identité. Si les informations ci-dessous sont incorrectes, - veuillez %{link} de votre carte d’identité délivrée par l’État. + veuillez %{link_html} de votre carte d’identité délivrée par l’État. capture_scan_warning_link: télécharger de nouvelles photos capture_troubleshooting_tips: Vous rencontrez des difficultés pour ajouter votre pièce d’identité? document_capture: Ajoutez votre carte d’identité délivrée par l’État @@ -160,8 +160,8 @@ fr: services. explanation_non_sp_html: Vous utilisez %{app_name} pour vérifier votre identité. only_add_if_text: 'N’AJOUTEZ VOTRE IDENTIFIANT QUE SI :' - only_add_own_account_html: Vous utilisez votre propre compte %{app_name} - only_add_phone_verify_html: Vous avez demandé à %{app_name} de vérifier votre + only_add_own_account: Vous utilisez votre propre compte %{app_name} + only_add_phone_verify: Vous avez demandé à %{app_name} de vérifier votre identité en utilisant votre téléphone only_add_sp_services_html: Vous essayez d’accéder aux services de %{service_provider_name} @@ -215,8 +215,8 @@ fr: être équipé d’un appareil photo et d’un navigateur web. verify_identity: Nous vous demanderons vos informations personnelles afin de vérifier votre identité par rapport aux registres publics. - welcome_html: '%{sp_name} doit s’assurer que vous êtes bien vous, et non - quelqu’un qui se fait passer pour vous.' + welcome: '%{sp_name} doit s’assurer que vous êtes bien vous, et non quelqu’un + qui se fait passer pour vous.' you_entered: 'Tu as soumis:' instructions: bullet1: Carte d’identité délivrée par l’État diff --git a/config/locales/event_types/en.yml b/config/locales/event_types/en.yml index 1bbbc35dc64..d56e1d17811 100644 --- a/config/locales/event_types/en.yml +++ b/config/locales/event_types/en.yml @@ -4,7 +4,7 @@ en: account_created: Account created account_verified: Account verified authenticated_at: Signed in at %{service_provider} - authenticated_at_html: Signed in at %{service_provider_link} + authenticated_at_html: Signed in at %{service_provider_link_html} authenticator_disabled: Authenticator app removed authenticator_enabled: Authenticator app added backup_codes_added: Backup codes added diff --git a/config/locales/event_types/es.yml b/config/locales/event_types/es.yml index 85c7df118d4..628e54848fa 100644 --- a/config/locales/event_types/es.yml +++ b/config/locales/event_types/es.yml @@ -4,7 +4,7 @@ es: account_created: Cuenta creada account_verified: Cuenta verificada authenticated_at: Sesión iniciada en %{service_provider} - authenticated_at_html: Sesión iniciada en %{service_provider_link} + authenticated_at_html: Sesión iniciada en %{service_provider_link_html} authenticator_disabled: Aplicación autenticadora eliminada authenticator_enabled: Aplicación de autenticador agregada backup_codes_added: Códigos de respaldo añadidos diff --git a/config/locales/event_types/fr.yml b/config/locales/event_types/fr.yml index ce7d8e44014..3eca7777284 100644 --- a/config/locales/event_types/fr.yml +++ b/config/locales/event_types/fr.yml @@ -4,7 +4,7 @@ fr: account_created: Compte créé account_verified: Compte vérifié authenticated_at: Connecté à %{service_provider} - authenticated_at_html: Connecté à %{service_provider_link} + authenticated_at_html: Connecté à %{service_provider_link_html} authenticator_disabled: Application d’authentification supprimée authenticator_enabled: Application authenticator ajoutée backup_codes_added: Codes de sauvegarde ajoutés diff --git a/config/locales/forms/en.yml b/config/locales/forms/en.yml index 7f2a33b8a20..3ecb1f0edc4 100644 --- a/config/locales/forms/en.yml +++ b/config/locales/forms/en.yml @@ -122,8 +122,7 @@ en: access your %{app_name} account. confirm: Are you sure you want to remove your authentication app? totp_setup: - totp_intro_html: Set up an authentication app to sign in using temporary - security codes. %{link} + totp_intro: Set up an authentication app to sign in using temporary security codes. totp_step_1: Give it a nickname totp_step_1a: If you add more than one app, you’ll know which one is which. totp_step_2: Open your authentication app @@ -144,10 +143,10 @@ en: submit: Confirm account title: Confirm your account welcome_back: Welcome back - welcome_back_description: '

If you have received your letter, please enter - your one-time code below.

If your letter hasn’t arrived yet, - please be patient as letters typically take 3 to 7 business days - to arrive. Thank you for your patience.

' + welcome_back_description_html: '

If you have received your letter, please + enter your one-time code below.

If your letter hasn’t arrived + yet, please be patient as letters typically take 3 to 7 business + days to arrive. Thank you for your patience.

' wrong_address: Not the right address? webauthn_delete: caution: If you remove your security key you won’t be able to use it to access diff --git a/config/locales/forms/es.yml b/config/locales/forms/es.yml index 81ddbb2d8ee..0d25761efcf 100644 --- a/config/locales/forms/es.yml +++ b/config/locales/forms/es.yml @@ -129,8 +129,8 @@ es: a su cuenta %{app_name}. confirm: '¿Seguro que quieres eliminar tu aplicación de autenticación?' totp_setup: - totp_intro_html: Configure una aplicación de autenticación para iniciar sesión - con códigos de seguridad temporales. %{link} + totp_intro: Configure una aplicación de autenticación para iniciar sesión con + códigos de seguridad temporales. totp_step_1: Darle un apodo totp_step_1a: Si agrega más de una aplicación, sabrá cuáles. totp_step_2: Abra su app de autenticación. @@ -151,7 +151,7 @@ es: submit: Confirmar cuenta title: Confirme su cuenta welcome_back: Bienvenido de nuevo - welcome_back_description: '

Si ha recibido su carta, introduzca su código + welcome_back_description_html: '

Si ha recibido su carta, introduzca su código único a continuación.

Si su carta aún no ha llegado, tenga paciencia, ya que las cartas suelen tardar de 3 a 7 días hábiles en llegar. Gracias por su paciencia.

' diff --git a/config/locales/forms/fr.yml b/config/locales/forms/fr.yml index 7d970224aae..65622cafc47 100644 --- a/config/locales/forms/fr.yml +++ b/config/locales/forms/fr.yml @@ -131,8 +131,8 @@ fr: plus l’utiliser pour accéder à votre compte %{app_name}. confirm: Voulez-vous vraiment supprimer votre application d’authentification? totp_setup: - totp_intro_html: Configurez une application d’authentification pour vous - connecter à l’aide de codes de sécurité temporaires. %{link} + totp_intro: Configurez une application d’authentification pour vous connecter à + l’aide de codes de sécurité temporaires. totp_step_1: Donnez-lui un surnom totp_step_1a: Si vous ajoutez plusieurs applications, vous saurez lesquelles. totp_step_2: Démarrez votre application d’authentification @@ -154,11 +154,11 @@ fr: submit: Confirmer le compte title: Confirmez votre compte welcome_back: Content de vous revoir - welcome_back_description: '

Si vous avez reçu votre lettre, veuillez entrer - votre code à usage unique ci-dessous.

Si votre lettre n’est pas - encore arrivée, veuillez être patient car les lettres prennent - généralement entre trois à sept jours ouvrables pour arriver. - Nous vous remercions de votre patience.

' + welcome_back_description_html: '

Si vous avez reçu votre lettre, veuillez + entrer votre code à usage unique ci-dessous.

Si votre lettre + n’est pas encore arrivée, veuillez être patient car les lettres + prennent généralement entre trois à sept jours ouvrables pour + arriver. Nous vous remercions de votre patience.

' wrong_address: Pas la bonne adresse? webauthn_delete: caution: Si vous supprimez votre clé de sécurité, vous ne pourrez plus diff --git a/config/locales/idv/en.yml b/config/locales/idv/en.yml index 1fd84ab0e6d..39e8e54e503 100644 --- a/config/locales/idv/en.yml +++ b/config/locales/idv/en.yml @@ -25,7 +25,7 @@ en: - If you exit %{app_name} and return to %{sp_name}, you will not have verified your identity. - You will still have a %{app_name} account. You can manage or - delete your account on your %{account_page_link}. + delete your account on your %{account_page_link_html}. without_sp: - If you exit identity verification and go to your account page, you will not have verified your identity. @@ -71,7 +71,7 @@ en: post_office_search_error: We are having technical difficulties at the moment. Try searching for a Post Office again. If this issue continues, come back later. - text_html: Please try again. If you keep getting these errors, %{link}. + text_html: Please try again. If you keep getting these errors, %{link_html}. usps_outage_error_message: post_cta: body: In the meantime, you can still begin the in-person verification process on @@ -130,9 +130,10 @@ en: warning: Please check the information you entered and try again. Common mistakes are an incorrect Social Security number or ZIP Code. setup: - fail_date_html: Call our contact center by %{date} to continue verifying your identity. - fail_html: Call %{contact_number} and provide them with the error code + fail: Call %{contact_number} and provide them with the error code %{support_code}. + fail_date_html: Call our contact center by %{date_html} to continue verifying + your identity. heading: Please give us a call timeout: We are experiencing higher than usual wait time processing your request. Please try again. @@ -162,7 +163,7 @@ en: last_name: Last name password: Password ssn: Social Security number - ssn_label_html: Social Security number + ssn_label: Social Security number state: State zipcode: ZIP Code images: @@ -174,7 +175,7 @@ en: state_issue: State‑issued ID messages: activated_html: Your identity has been verified. If you need to change your - verified information, please %{link}. + verified information, please %{link_html}. activated_link: contact us clear_and_start_over: Clear my information and start over come_back_later_html:

Letters typically take 3 to 7 business @@ -260,7 +261,7 @@ en: someone pretending to be you.' without_sp: 'The agency that you are trying to access needs to make sure you are you — not someone pretending to be you.' - next_steps_html: '%{status_page_link} or exit %{app_name} and try again later.' + next_steps_html: '%{status_page_link_html} or exit %{app_name} and try again later.' status_page_link: 'Get updates on our status page' technical_difficulties: Unfortunately, we are having technical difficulties and cannot verify your identity at this time. diff --git a/config/locales/idv/es.yml b/config/locales/idv/es.yml index 34797a3a6d6..ddbacbcb285 100644 --- a/config/locales/idv/es.yml +++ b/config/locales/idv/es.yml @@ -26,7 +26,7 @@ es: - Si sale de %{app_name} ahora y regresa a %{sp_name}, no habrá verificado su identidad. - No obstante, continuará teniendo una cuenta en %{app_name}. Puede - administrar o eliminar su cuenta desde %{account_page_link}. + administrar o eliminar su cuenta desde %{account_page_link_html}. without_sp: - Si sale de la verificación de identidad y se dirige a la página de su cuenta, no habrá verificado su identidad. @@ -73,7 +73,7 @@ es: post_office_search_error: En este momento, estamos teniendo problemas técnicos. Trate de buscar de nuevo una oficina de correos. Si el problema continúa, regrese más tarde. - text_html: Inténtalo de nuevo. Si sigues recibiendo estos errores, %{link}. + text_html: Inténtalo de nuevo. Si sigues recibiendo estos errores, %{link_html}. usps_outage_error_message: post_cta: body: Mientras tanto, todavía puedes iniciar el proceso de verificación @@ -139,10 +139,10 @@ es: Los errores más comunes suelen producirse al ingresar un Número de Seguridad Social o un Código Postal incorrecto. setup: - fail_date_html: Llame a nuestro centro de atención antes del %{date} para seguir - verificando su identidad. - fail_html: Llame al %{contact_number} y facilíteles el código de error + fail: Llame al %{contact_number} y facilíteles el código de error %{support_code}. + fail_date_html: Llame a nuestro centro de atención antes del %{date_html} para + seguir verificando su identidad. heading: Llámenos timeout: Estamos experimentando un tiempo de espera superior al habitual al procesar su solicitud. Inténtalo de nuevo. @@ -171,7 +171,7 @@ es: last_name: Apellido password: Contraseña ssn: Número de seguridad social - ssn_label_html: Número de Seguro Social + ssn_label: Número de Seguro Social state: Estado zipcode: Código postal images: @@ -183,7 +183,7 @@ es: state_issue: Documento de identidad emitido por el Estado messages: activated_html: Su identidad ha sido verificada. Si necesita cambiar la - información verificada, por favor, %{link}. + información verificada, por favor, %{link_html}. activated_link: Contáctenos clear_and_start_over: Borrar mi información y empezar de nuevo come_back_later_html:

Las cartas suelen tardar de 3 a 7 días @@ -275,7 +275,7 @@ es: realmente y no alguien que se hace pasar por usted.' without_sp: 'La agencia a la que está intentando acceder debe asegurarse de que usted sea quien dice ser, y no alguien que se hace pasar por usted.' - next_steps_html: '%{status_page_link} o salga de %{app_name} y vuelva a + next_steps_html: '%{status_page_link_html} o salga de %{app_name} y vuelva a intentarlo más tarde.' status_page_link: 'Consulte las actualizaciones en nuestra página de estado' technical_difficulties: Lamentablemente, debido a problemas técnicos por nuestra diff --git a/config/locales/idv/fr.yml b/config/locales/idv/fr.yml index be1c6bcd4b7..92350997147 100644 --- a/config/locales/idv/fr.yml +++ b/config/locales/idv/fr.yml @@ -26,7 +26,7 @@ fr: - Si vous quittez %{app_name} maintenant pour retourner sur %{sp_name}, vous n’aurez pas vérifié votre identité. - Vous aurez toujours un compte %{app_name}. Vous pouvez gérer ou - supprimer votre compte sur %{account_page_link}. + supprimer votre compte sur %{account_page_link_html}. without_sp: - Si vous quittez la vérification d’identité et accédez à la page de votre compte, vous n’aurez pas vérifié votre identité. @@ -76,7 +76,8 @@ fr: post_office_search_error: Nous connaissons des difficultés techniques en ce moment. Essayez de chercher à nouveau un bureau de poste. Si le problème persiste, revenez plus tard. - text_html: Veuillez réessayer. Si vous continuez à recevoir ces erreurs, %{link} + text_html: Veuillez réessayer. Si vous continuez à recevoir ces erreurs, + %{link_html} usps_outage_error_message: post_cta: body: En attendant, vous pouvez toujours commencer la procédure de vérification @@ -146,10 +147,9 @@ fr: Les erreurs les plus courantes sont un numéro de sécurité sociale ou un code postal incorrect. setup: - fail_date_html: Appelez notre centre de contact avant le %{date} pour continuer - à vérifier votre identité. - fail_html: Appelez le %{contact_number} et indiquez le code d’erreur - %{support_code}. + fail: Appelez le %{contact_number} et indiquez le code d’erreur %{support_code}. + fail_date_html: Appelez notre centre de contact avant le %{date_html} pour + continuer à vérifier votre identité. heading: S’il vous plaît, appelez-nous timeout: Le temps d’attente pour le traitement de votre demande est plus long que d’habitude Veuillez réessayer. @@ -179,7 +179,7 @@ fr: last_name: Nom de famille password: Mot de passe ssn: Numéro de sécurité sociale - ssn_label_html: Numéro de sécurité sociale + ssn_label: Numéro de sécurité sociale state: État zipcode: Code postal images: @@ -191,7 +191,7 @@ fr: state_issue: Carte d’identité délivrée par l’État messages: activated_html: Votre identité a été vérifiée. Si vous souhaitez modifier votre - information vérifiée, veuillez %{link}. + information vérifiée, veuillez %{link_html}. activated_link: communiquer avec nous clear_and_start_over: Supprimer mes données et recommencer come_back_later_html:

Les lettres prennent généralement trois à sept @@ -291,7 +291,7 @@ fr: without_sp: 'L’agence à laquelle vous essayez d’accéder doit s’assurer qu’il s’agit bien de vous, et non de quelqu’un qui se fait passer pour vous.' - next_steps_html: '%{status_page_link} ou quittez le site %{app_name} et + next_steps_html: '%{status_page_link_html} ou quittez le site %{app_name} et réessayez plus tard.' status_page_link: 'Obtenez des mises à jour sur notre page de statut' technical_difficulties: Malheureusement, nous rencontrons des difficultés diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml index 10555a5285b..687a297745a 100644 --- a/config/locales/in_person_proofing/en.yml +++ b/config/locales/in_person_proofing/en.yml @@ -18,8 +18,8 @@ en: questions: Questions? retail_hours: Retail hours retail_hours_closed: Closed - 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_html: You may now %{link_html} 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: diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml index 54771cf635a..2d1b9935bf1 100644 --- a/config/locales/in_person_proofing/es.yml +++ b/config/locales/in_person_proofing/es.yml @@ -21,8 +21,8 @@ es: questions: '¿Tiene alguna pregunta?' retail_hours: Horario de atención al público retail_hours_closed: Cerrado - 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_html: Ahora puede %{link_html} 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: diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml index 1ab82001bc7..e5bb6a14460 100644 --- a/config/locales/in_person_proofing/fr.yml +++ b/config/locales/in_person_proofing/fr.yml @@ -21,9 +21,9 @@ fr: questions: Des questions? retail_hours: Heures d’ouverture retail_hours_closed: Fermé - 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_html: Vous pouvez %{link_html} 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: diff --git a/config/locales/instructions/en.yml b/config/locales/instructions/en.yml index 70a67b7284a..9cf62bc4fe2 100644 --- a/config/locales/instructions/en.yml +++ b/config/locales/instructions/en.yml @@ -20,7 +20,7 @@ en: authenticator: confirm_code_html: Enter the code from your authenticator app. If you have several accounts set up in your app, enter the code corresponding to - %{app_name}. + %{app_name_html}. manual_entry: Or enter this code manually into your authentication app piv_cac: account_not_found_html: '

%{sign_in} with your email address @@ -34,27 +34,26 @@ en: your PIV/CAC).' already_associated_html: Please choose a certificate from a different PIV/CAC, contact your administrator to ensure your PIV/CAC is up to date. If - you think this is an error, %{try_again}. + you think this is an error, %{try_again_html}. back_to_sign_in: Go back to sign in - confirm_piv_cac_html: Present the PIV/CAC that you associated with your account. - confirm_piv_cac_only_html: This app requires a higher level of security. You - need to verify your identity using a government employee ID that you + confirm_piv_cac: Present the PIV/CAC that you associated with your account. + confirm_piv_cac_only: This app requires a higher level of security. You need to + verify your identity using a government employee ID that you previously set up to access your information. - confirm_piv_cac_or_aal3_html: This app requires a higher level of security. You - need to verify your identity using a physical device such as a - security key or government employee ID (PIV or CAC) to access your - information. - did_not_work_html: Please %{please_try_again}. If this problem continues, + confirm_piv_cac_or_aal3: This app requires a higher level of security. You need + to verify your identity using a physical device such as a security key + or government employee ID (PIV or CAC) to access your information. + did_not_work_html: Please %{please_try_again_html}. If this problem continues, contact your agency administrator. http_failure: The server took too long to respond. Please try again. no_certificate_html: Please make sure your PIV/CAC is connected and - %{try_again}. If this problem continues, contact your agency + %{try_again_html}. If this problem continues, contact your agency administrator. not_auth_cert_html: The certificate you selected is invalid for this account. - Please %{please_try_again} with a different certificate. If this + Please %{please_try_again_html} with a different certificate. If this problem continues, contact your agency administrator. please_try_again: try again - sign_in: Make sure you have a %{app_name} account and + sign_in_html: Make sure you have a %{app_name} account and you’ve set up PIV/CAC as a two-factor authentication method. step_1: Give it a nickname @@ -66,21 +65,20 @@ en: PIN (your PIN was created when you set up your PIV/CAC). try_again: try again sms: - number_message_html: We sent a text (SMS) with a one-time code to %{number}. - This code will expire in %{expiration} minutes. + number_message_html: We sent a text (SMS) with a one-time code to + %{number_html}. This code will expire in %{expiration} minutes. voice: - number_message_html: We made a call with a one-time code to %{number}. This code - will expire in %{expiration} minutes. + number_message_html: We made a call with a one-time code to %{number_html}. This + code will expire in %{expiration} minutes. webauthn: - confirm_webauthn_html: Present the security key that you associated with your account. - confirm_webauthn_only_html: This app requires a higher level of security. You - need to verify your identity using a security key that you previously - set up to access your information. - confirm_webauthn_or_aal3_html: This app requires a higher level of security. You - need to verify your identity using a physical device such as a - security key or government employee ID (PIV or CAC) to access your - information. - confirm_webauthn_platform_html: You have face or touch unlock enabled for your %{app_name} account. + confirm_webauthn: Present the security key that you associated with your account. + confirm_webauthn_only: This app requires a higher level of security. You need to + verify your identity using a security key that you previously set up + to access your information. + confirm_webauthn_or_aal3: This app requires a higher level of security. You need + to verify your identity using a physical device such as a security key + or government employee ID (PIV or CAC) to access your information. + confirm_webauthn_platform: You have face or touch unlock enabled for your %{app_name} account. wrong_number: Entered the wrong phone number? password: forgot: Don’t know your password? Reset it after confirming your email address. diff --git a/config/locales/instructions/es.yml b/config/locales/instructions/es.yml index 14e9b26b185..39f035ead11 100644 --- a/config/locales/instructions/es.yml +++ b/config/locales/instructions/es.yml @@ -22,7 +22,7 @@ es: authenticator: confirm_code_html: Ingrese el código de su app de autenticación. Si tiene varias cuentas configuradas en su app, ingrese el código correspondiente a - %{app_name}. + %{app_name_html}. manual_entry: O ingrese este código manualmente en su aplicación de autenticación piv_cac: account_not_found_html: '

%{sign_in} con su dirección de @@ -36,28 +36,27 @@ es: PIV / CAC )' already_associated_html: Elige un certificado de una PIV/CAC distinta o ponte en contacto con el administrador para confirmar que tu PIV/CAC está al - día. Si cree que se trata de un error, %{try_again}. + día. Si cree que se trata de un error, %{try_again_html}. back_to_sign_in: Regrese para iniciar sesión - confirm_piv_cac_html: Presenta la PIV/CAC que asociaste con tu cuenta. - confirm_piv_cac_only_html: Esta aplicación requiere un mayor nivel de seguridad. - Debe verificar su identidad con una identificación de empleado del - Gobierno que haya configurado previamente para acceder a su - información. - confirm_piv_cac_or_aal3_html: Esta aplicación requiere un mayor nivel de - seguridad. Debe verificar su identidad con un dispositivo físico, como - una llave de seguridad o una identificación de empleado del Gobierno - (PIV o CAC) para acceder a su información. - did_not_work_html: '%{please_try_again}. Comuníquese con el encargado de su + confirm_piv_cac: Presenta la PIV/CAC que asociaste con tu cuenta. + confirm_piv_cac_only: Esta aplicación requiere un mayor nivel de seguridad. Debe + verificar su identidad con una identificación de empleado del Gobierno + que haya configurado previamente para acceder a su información. + confirm_piv_cac_or_aal3: Esta aplicación requiere un mayor nivel de seguridad. + Debe verificar su identidad con un dispositivo físico, como una llave + de seguridad o una identificación de empleado del Gobierno (PIV o CAC) + para acceder a su información. + did_not_work_html: '%{please_try_again_html}. Comuníquese con el encargado de su organismo si persiste este problema.' http_failure: El servidor tardó demasiado en responder. Inténtalo de nuevo. - no_certificate_html: Asegúrese de su PIV/CAC esté conectada e %{try_again}. + no_certificate_html: Asegúrese de su PIV/CAC esté conectada e %{try_again_html}. Comuníquese con el encargado de su organismo si persiste este problema. not_auth_cert_html: El certificado que seleccionó no es válido para esta cuenta. - %{please_try_again} con un certificado diferente. Comuníquese con el - encargado de su organismo si persiste este problema. + %{please_try_again_html} con un certificado diferente. Comuníquese con + el encargado de su organismo si persiste este problema. please_try_again: Vuelva a intentarlo - sign_in: Asegúrese de que tenga una cuenta %{app_name} y + sign_in_html: Asegúrese de que tenga una cuenta %{app_name} y haya configurado PIV/CAC como método de autenticación de dos factores. step_1: Darle un apodo @@ -70,21 +69,21 @@ es: try_again: inténtelo de nuevo sms: number_message_html: Enviamos un mensaje de texto (SMS) con un código único al - %{number}. Este código caducará en %{expiration} minutos. + %{number_html}. Este código caducará en %{expiration} minutos. voice: number_message_html: Realizamos una llamada con un código de un solo uso al - %{number}. Este código expirará en %{expiration} minutos. + %{number_html}. Este código expirará en %{expiration} minutos. webauthn: - confirm_webauthn_html: Presente la clave de seguridad que asoció con su cuenta. - confirm_webauthn_only_html: Esta aplicación requiere un mayor nivel de - seguridad. Debe verificar su identidad con una llave de seguridad que - haya configurado previamente para acceder a su información. - confirm_webauthn_or_aal3_html: Esta aplicación requiere un mayor nivel de - seguridad. Debe verificar su identidad con un dispositivo físico, como - una llave de seguridad o una identificación de empleado del Gobierno - (PIV o CAC) para acceder a su información. - confirm_webauthn_platform_html: Tiene activado el desbloqueo facial o táctil - para su cuenta de %{app_name}. + confirm_webauthn: Presente la clave de seguridad que asoció con su cuenta. + confirm_webauthn_only: Esta aplicación requiere un mayor nivel de seguridad. + Debe verificar su identidad con una llave de seguridad que haya + configurado previamente para acceder a su información. + confirm_webauthn_or_aal3: Esta aplicación requiere un mayor nivel de seguridad. + Debe verificar su identidad con un dispositivo físico, como una llave + de seguridad o una identificación de empleado del Gobierno (PIV o CAC) + para acceder a su información. + confirm_webauthn_platform: Tiene activado el desbloqueo facial o táctil para su + cuenta de %{app_name}. wrong_number: '¿Ingresó el número de teléfono equivocado?' password: forgot: '¿No sabe su contraseña? Restablézcala después de confirmar su email.' diff --git a/config/locales/instructions/fr.yml b/config/locales/instructions/fr.yml index 532d347ec1d..a91839f5d7b 100644 --- a/config/locales/instructions/fr.yml +++ b/config/locales/instructions/fr.yml @@ -24,7 +24,7 @@ fr: authenticator: confirm_code_html: Entrez le code à partir de votre application d’authentification. Si vous avez plusieurs comptes configurés dans - votre application, entrez le code correspondant à %{app_name}. + votre application, entrez le code correspondant à %{app_name_html}. manual_entry: Ou entrez ce code manuellement dans votre application d’authentification piv_cac: @@ -41,31 +41,33 @@ fr: already_associated_html: Veuillez choisir un certificat associé à une autre carte PIV/CAC ou contactez votre administrateur afin de vérifier que votre carte PIV/CAC est bien à jour. Si vous pensez que c’est une - erreur, %{try_again}. + erreur, %{try_again_html}. back_to_sign_in: Retourner à vous connecter - confirm_piv_cac_html: Veuillez présenter la carte PIV/CAC que vous avez associée - à votre compte. - confirm_piv_cac_only_html: Cette application nécessite un niveau de sécurité - plus élevé. Vous devez vérifier votre identité à l’aide d’un badge + confirm_piv_cac: Veuillez présenter la carte PIV/CAC que vous avez associée à + votre compte. + confirm_piv_cac_only: Cette application nécessite un niveau de sécurité plus + élevé. Vous devez vérifier votre identité à l’aide d’un badge d’employé du gouvernement que vous avez précédemment configuré pour accéder à vos informations. - confirm_piv_cac_or_aal3_html: Cette application nécessite un niveau de sécurité - plus élevé. Vous devez vérifier votre identité à l’aide d’un - dispositif physique tel qu’une clé de sécurité ou un badge d’employé - du gouvernement (PIV ou CAC) pour accéder à vos informations. - did_not_work_html: Veuillez %{please_try_again}. Si ce problème persiste, + confirm_piv_cac_or_aal3: Cette application nécessite un niveau de sécurité plus + élevé. Vous devez vérifier votre identité à l’aide d’un dispositif + physique tel qu’une clé de sécurité ou un badge d’employé du + gouvernement (PIV ou CAC) pour accéder à vos informations. + did_not_work_html: Veuillez %{please_try_again_html}. Si ce problème persiste, contactez l’administrateur de votre agence. http_failure: Le serveur a mis trop de temps à répondre. Veuillez réessayer. no_certificate_html: Veuillez vous assurer que votre PIV/CAC est connecté et - %{try_again}. Si ce problème persiste, contactez l’administrateur de - votre agence. + %{try_again_html}. Si ce problème persiste, contactez l’administrateur + de votre agence. not_auth_cert_html: Le certificat que vous avez sélectionné n’est pas valide - pour ce compte. Veuillez %{please_try_again} avec un autre certificat. - Si ce problème persiste, contactez l’administrateur de votre agence. + pour ce compte. Veuillez %{please_try_again_html} avec un autre + certificat. Si ce problème persiste, contactez l’administrateur de + votre agence. please_try_again: réessayer - sign_in: Assurez-vous que vous disposez d’un compte %{app_name} - et que vous avez configuré PIV/CAC en tant que - méthode d’authentification à deux facteurs. + sign_in_html: Assurez-vous que vous disposez d’un compte + %{app_name} et que vous avez configuré + PIV/CAC en tant que méthode d’authentification à deux + facteurs. step_1: Donnez-lui un surnom step_1_info: Si vous ajoutez plus d’un PIV / CAC, vous saurez lequel. step_2: Insérez votre PIV/CAC dans votre lecteur de carte @@ -77,22 +79,22 @@ fr: try_again: réessayer sms: number_message_html: Nous avons envoyé un texte (SMS) avec un code à usage - unique au %{number}. Ce code expirera dans %{expiration} minutes. + unique au %{number_html}. Ce code expirera dans %{expiration} minutes. voice: number_message_html: Nous avons envoyé un code à usage unique par appel au - %{number}. Ce code expirera dans %{expiration} minutes. + %{number_html}. Ce code expirera dans %{expiration} minutes. webauthn: - confirm_webauthn_html: Présentez la clé de sécurité associée à votre compte. - confirm_webauthn_only_html: Cette application nécessite un niveau de sécurité - plus élevé. Vous devez vérifier votre identité à l’aide d’une clé de + confirm_webauthn: Présentez la clé de sécurité associée à votre compte. + confirm_webauthn_only: Cette application nécessite un niveau de sécurité plus + élevé. Vous devez vérifier votre identité à l’aide d’une clé de sécurité que vous avez précédemment configurée pour accéder à vos informations. - confirm_webauthn_or_aal3_html: Cette application nécessite un niveau de sécurité - plus élevé. Vous devez vérifier votre identité à l’aide d’un - dispositif physique tel qu’une clé de sécurité ou un badge d’employé - du gouvernement (PIV ou CAC) pour accéder à vos informations. - confirm_webauthn_platform_html: Vous avez activé le déverrouillage facial ou - tactile pour votre compte %{app_name}. + confirm_webauthn_or_aal3: Cette application nécessite un niveau de sécurité plus + élevé. Vous devez vérifier votre identité à l’aide d’un dispositif + physique tel qu’une clé de sécurité ou un badge d’employé du + gouvernement (PIV ou CAC) pour accéder à vos informations. + confirm_webauthn_platform: Vous avez activé le déverrouillage facial ou tactile + pour votre compte %{app_name}. wrong_number: Vous avez entré un mauvais numéro de téléphone? password: forgot: Vous ne connaissez pas votre mot de passe? Réinitialisez-le après avoir diff --git a/config/locales/notices/en.yml b/config/locales/notices/en.yml index 1d4e0b82ee8..55e754195a3 100644 --- a/config/locales/notices/en.yml +++ b/config/locales/notices/en.yml @@ -15,7 +15,7 @@ en: resend_email_success: We sent another password reset email. use_diff_email: link: create a new account - text_html: Or, %{link} using a different email address. + text_html: Or, %{link_html} using a different email address. maintenance: contact_us: Contact us currently_under_maintenance_html: We are currently under maintenance until @@ -47,25 +47,25 @@ en: timeout_warning: partially_signed_in: continue: Continue sign in - live_region_message_html: You will be signed out in %{time_left_in_session}. - Select “keep me signed in” to stay logged in. Select “sign me out” to - sign out. - message_html: For your security, in %{time_left_in_session} we will cancel your - sign in. + live_region_message_html: You will be signed out in + %{time_left_in_session_html}. Select “keep me signed in” to stay + logged in. Select “sign me out” to sign out. + message_html: For your security, in %{time_left_in_session_html} we will cancel + your sign in. sign_out: Cancel sign in signed_in: continue: Keep me signed in - live_region_message_html: You will be signed out in %{time_left_in_session}. - Select “keep me signed in” to stay logged in. Select “sign me out” to - sign out. - message_html: For your security, we will sign you out in %{time_left_in_session} - unless you tell us otherwise. + live_region_message_html: You will be signed out in + %{time_left_in_session_html}. Select “keep me signed in” to stay + logged in. Select “sign me out” to sign out. + message_html: For your security, we will sign you out in + %{time_left_in_session_html} unless you tell us otherwise. sign_out: Sign me out totp_configured: An authentication app was added to your account. totp_disabled: Your authentication app was deleted from your account. use_diff_email: link: use a different email address - text_html: Or, %{link} + text_html: Or, %{link_html} webauthn_configured: A security key was added to your account. webauthn_deleted: Your security key was deleted from your account. webauthn_platform_configured: Face or touch unlock was added to your account. diff --git a/config/locales/notices/es.yml b/config/locales/notices/es.yml index 8ace2e6f115..15f3b495a25 100644 --- a/config/locales/notices/es.yml +++ b/config/locales/notices/es.yml @@ -15,7 +15,7 @@ es: resend_email_success: Enviamos otro email para restablecer la contraseña. use_diff_email: link: crear una cuenta nueva - text_html: O, %{link} utilizando un email diferente. + text_html: O, %{link_html} utilizando un email diferente. maintenance: contact_us: Contacta con nosotros currently_under_maintenance_html: Actualmente estamos en mantenimiento hasta @@ -49,24 +49,25 @@ es: timeout_warning: partially_signed_in: continue: Continuar el inicio de sesión - live_region_message_html: Tu sesión se cerrará en %{time_left_in_session}. + live_region_message_html: Tu sesión se cerrará en %{time_left_in_session_html}. Selecciona “seguir conectado” para mantener tu sesión activa. Seleccione “desconécteme” para cerrar la sesión. - message_html: Para su seguridad, en %{time_left_in_session} cancelaremos su acceso. + message_html: Para su seguridad, en %{time_left_in_session_html} cancelaremos su + acceso. sign_out: Cancelar el inicio de sesión signed_in: continue: Manténgame conectado - live_region_message_html: Tu sesión se cerrará en %{time_left_in_session}. + live_region_message_html: Tu sesión se cerrará en %{time_left_in_session_html}. Selecciona “seguir conectado” para mantener tu sesión activa. Seleccione “desconécteme” para cerrar la sesión. message_html: Para su seguridad, terminaremos su sesión en - %{time_left_in_session} a menos que nos indique lo contrario. + %{time_left_in_session_html} a menos que nos indique lo contrario. sign_out: Desconécteme totp_configured: Una aplicación de autenticación fue agregada a tu cuenta. totp_disabled: Tu aplicación de autenticación fue eliminada de tu cuenta. use_diff_email: link: use un email diferente - text_html: O %{link} + text_html: O %{link_html} webauthn_configured: Una llave de seguridad fue agregada a tu cuenta. webauthn_deleted: Tu llave de seguridad fue eliminada de tu cuenta. webauthn_platform_configured: Desbloqueo facial o táctil fue agregada a tu cuenta. diff --git a/config/locales/notices/fr.yml b/config/locales/notices/fr.yml index 42e0db9d12e..e710595be57 100644 --- a/config/locales/notices/fr.yml +++ b/config/locales/notices/fr.yml @@ -15,7 +15,7 @@ fr: resend_email_success: Nous avons envoyé un autre courriel de réinitialisation de mot de passe. use_diff_email: link: Créer un nouveau compte - text_html: Ou, %{link} en utilisant une adresse courriel différente. + text_html: Ou, %{link_html} en utilisant une adresse courriel différente. maintenance: contact_us: Nous contacter currently_under_maintenance_html: Nous sommes actuellement en maintenance @@ -49,25 +49,28 @@ fr: timeout_warning: partially_signed_in: continue: Continuer la connexion - live_region_message_html: Vous serez déconnecté dans %{time_left_in_session}. - Sélectionnez « garder ma connexion » pour rester connecté. - Sélectionnez « déconnectez-moi » pour vous déconnecter. + live_region_message_html: Vous serez déconnecté dans + %{time_left_in_session_html}. Sélectionnez « garder ma connexion » + pour rester connecté. Sélectionnez « déconnectez-moi » pour vous + déconnecter. message_html: Pour votre sécurité, nous annulerons votre connexion dans - %{time_left_in_session}. + %{time_left_in_session_html}. sign_out: Annuler la connexion signed_in: continue: Gardez ma connexion active - live_region_message_html: Vous serez déconnecté dans %{time_left_in_session}. - Sélectionnez « garder ma connexion » pour rester connecté. - Sélectionnez « déconnectez-moi » pour vous déconnecter. + live_region_message_html: Vous serez déconnecté dans + %{time_left_in_session_html}. Sélectionnez « garder ma connexion » + pour rester connecté. Sélectionnez « déconnectez-moi » pour vous + déconnecter. message_html: Pour votre sécurité, nous vous déconnecterons dans - %{time_left_in_session}, sauf en cas d’avis contraire de votre part. + %{time_left_in_session_html}, sauf en cas d’avis contraire de votre + part. sign_out: Déconnectez-moi totp_configured: Une application d’authentification a été ajoutée à votre compte. totp_disabled: Votre application d’authentification a été supprimée de votre compte. use_diff_email: link: utilisez une adresse courriel différente - text_html: Ou %{link} + text_html: Ou %{link_html} webauthn_configured: Une clé de sécurité a été ajoutée à votre compte. webauthn_deleted: Votre clé de sécurité a été supprimée de votre compte. webauthn_platform_configured: Déverouillage facial ou déverrouillage par diff --git a/config/locales/two_factor_authentication/en.yml b/config/locales/two_factor_authentication/en.yml index 0b11982267f..da15da43a58 100644 --- a/config/locales/two_factor_authentication/en.yml +++ b/config/locales/two_factor_authentication/en.yml @@ -4,13 +4,13 @@ en: account_reset: cancel_link: Cancel your request link: deleting your account - pending_html: You currently have a pending request to delete your account. It - takes 24 hours from the time you made the request to complete the - process. Please check back later. %{cancel_link} + pending: You currently have a pending request to delete your account. It takes + 24 hours from the time you made the request to complete the process. + Please check back later. successful_cancel: Thank you. Your request to delete your %{app_name} account has been cancelled. text_html: If you can’t use any of the authentication methods above, you can - reset your preferences by %{link}. + reset your preferences by %{link_html}. attempt_remaining_warning_html: one: You have %{count} attempt remaining. other: You have %{count} attempts remaining. @@ -82,10 +82,11 @@ en: opt_in: cant_use_phone: Can’t use your phone? error_retry: Sorry, we are having trouble opting you in. Please try again. - opted_out_html: You’ve opted out of receiving text messages at %{phone_number}. - You can opt in and receive a security code again to that phone number. + opted_out_html: You’ve opted out of receiving text messages at + %{phone_number_html}. You can opt in and receive a security code again + to that phone number. opted_out_last_30d_html: You’ve opted out of receiving text messages at - %{phone_number} within the last 30 days. We can only opt in a phone + %{phone_number_html} within the last 30 days. We can only opt in a phone number once every 30 days. title: We could not send a security code to your phone number wait_30d_opt_in: After 30 days, you can opt in and receive a security code to @@ -136,8 +137,8 @@ en: read_about_two_factor_authentication: Read about two-factor authentication recaptcha: disclosure_statement_html: This site is protected by reCAPTCHA and the Google - %{google_policy_link} and %{google_tos_link} apply. Read %{app_name}’s - %{login_tos_link}. + %{google_policy_link_html} and %{google_tos_link_html} apply. Read + %{app_name}’s %{login_tos_link_html}. google_policy_link: Privacy Policy google_tos_link: Terms of Service login_tos_link: Mobile Terms of Use diff --git a/config/locales/two_factor_authentication/es.yml b/config/locales/two_factor_authentication/es.yml index 5fee10ace6f..78e35c0f696 100644 --- a/config/locales/two_factor_authentication/es.yml +++ b/config/locales/two_factor_authentication/es.yml @@ -4,13 +4,13 @@ es: account_reset: cancel_link: Cancelar su solicitud link: eliminando su cuenta - pending_html: Actualmente tiene una solicitud pendiente para eliminar su cuenta. - Se necesitan 24 horas desde el momento en que realizó la solicitud para - completar el proceso. Por favor, vuelva más tarde. %{cancel_link} + pending: Actualmente tiene una solicitud pendiente para eliminar su cuenta. Se + necesitan 24 horas desde el momento en que realizó la solicitud para + completar el proceso. Por favor, vuelva más tarde. successful_cancel: Gracias. Su solicitud para eliminar su cuenta de %{app_name} ha sido cancelada. text_html: Si no puede usar ninguna de estas opciones de seguridad anteriores, - puede restablecer tus preferencias por %{link}. + puede restablecer tus preferencias por %{link_html}. attempt_remaining_warning_html: one: Le quedan %{count} intento. other: Le quedan %{count} intentos. @@ -90,11 +90,11 @@ es: error_retry: Lo sentimos, estamos teniendo problemas para aceptarlo. Por favor, inténtelo de nuevo. opted_out_html: Ha optado por no recibir mensajes de texto en el - %{phone_number}. Puede optar por recibir un código de seguridad de nuevo - a ese número de teléfono. + %{phone_number_html}. Puede optar por recibir un código de seguridad de + nuevo a ese número de teléfono. opted_out_last_30d_html: Canceló su suscripción para recibir mensajes de texto - al %{phone_number} en los últimos 30 días. Solo podemos suscribir un - número telefónico una vez cada 30 días. + al %{phone_number_html} en los últimos 30 días. Solo podemos suscribir + un número telefónico una vez cada 30 días. title: No hemos podido enviar un código de seguridad a su número de teléfono wait_30d_opt_in: Después de 30 días, podrá inscribirse y recibir un código de seguridad para ese número de teléfono. @@ -145,8 +145,8 @@ es: read_about_two_factor_authentication: Conozca la autenticación de dos factores recaptcha: disclosure_statement_html: Este sitio está protegido por reCAPTCHA y se - %{google_policy_link} y %{google_tos_link} de Google. Consulte - %{login_tos_link} de %{app_name} para dispositivos móviles. + %{google_policy_link_html} y %{google_tos_link_html} de Google. Consulte + %{login_tos_link_html} de %{app_name} para dispositivos móviles. google_policy_link: aplican la política de privacidad google_tos_link: las condiciones de servicio login_tos_link: las condiciones de uso diff --git a/config/locales/two_factor_authentication/fr.yml b/config/locales/two_factor_authentication/fr.yml index 037daf6f645..bf330768ad2 100644 --- a/config/locales/two_factor_authentication/fr.yml +++ b/config/locales/two_factor_authentication/fr.yml @@ -4,14 +4,13 @@ fr: account_reset: cancel_link: Annuler votre demande link: supprimer votre compte - pending_html: Vous avez actuellement une demande en attente pour supprimer votre + pending: Vous avez actuellement une demande en attente pour supprimer votre compte. Il faut compter 24 heures à partir du moment où vous avez fait la demande pour terminer le processus. Veuillez vérifier plus tard. - %{cancel_link} successful_cancel: Je vous remercie. Votre demande de suppression de votre compte %{app_name} a été annulée. text_html: Si vous ne pouvez pas utiliser l’une de ces options de sécurité - ci-dessus, vous pouvez réinitialiser vos préférences par %{link}.. + ci-dessus, vous pouvez réinitialiser vos préférences par %{link_html}. attempt_remaining_warning_html: one: Il vous reste %{count} tentative. other: Il vous reste %{count} tentatives. @@ -91,12 +90,12 @@ fr: opt_in: cant_use_phone: Vous ne pouvez pas utiliser votre téléphone? error_retry: Désolé, nous avons des difficultés à vous connecter. Veuillez réessayer. - opted_out_html: Vous avez choisi de ne plus recevoir de SMS à %{phone_number}. - Vous pouvez vous inscrire et recevoir à nouveau un code de sécurité à ce - numéro de téléphone. + opted_out_html: Vous avez choisi de ne plus recevoir de SMS à + %{phone_number_html}. Vous pouvez vous inscrire et recevoir à nouveau un + code de sécurité à ce numéro de téléphone. opted_out_last_30d_html: Vous avez choisi de ne plus recevoir de SMS au - %{phone_number} au cours des 30 derniers jours. Nous ne pouvons opter - pour un numéro de téléphone qu’une fois tous les 30 jours. + %{phone_number_html} au cours des 30 derniers jours. Nous ne pouvons + opter pour un numéro de téléphone qu’une fois tous les 30 jours. title: Nous n’avons pas pu envoyer un code de sécurité à votre numéro de téléphone wait_30d_opt_in: Après 30 jours, vous pouvez vous inscrire et recevoir un code @@ -152,8 +151,9 @@ fr: read_about_two_factor_authentication: En savoir plus sur l’authentification à deux facteurs recaptcha: disclosure_statement_html: Ce site est protégé par reCAPTCHA. Les - %{google_policy_link} et les %{google_tos_link} de Google s’appliquent. - Lisez les %{login_tos_link} de %{app_name} pour les mobiles. + %{google_policy_link_html} et les %{google_tos_link_html} de Google + s’appliquent. Lisez les %{login_tos_link_html} de %{app_name} pour les + mobiles. google_policy_link: règles de confidentialité google_tos_link: conditions de service login_tos_link: conditions d’utilisation diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml index 36c6dbde09a..4e71ba61435 100644 --- a/config/locales/user_mailer/en.yml +++ b/config/locales/user_mailer/en.yml @@ -2,20 +2,20 @@ en: user_mailer: account_rejected: - intro_html: We couldn’t verify your identity with %{app_name}. Please contact - the agency whose service you are trying to access. + intro: We couldn’t verify your identity with %{app_name}. Please contact the + agency whose service you are trying to access. subject: We couldn’t verify your identity account_reset_cancel: intro_html: This email confirms you have cancelled your request to delete your - %{app_name} account. + %{app_name_html} account. subject: Request canceled account_reset_complete: - intro_html: This email confirms you have deleted your %{app_name} account. + intro_html: This email confirms you have deleted your %{app_name_html} account. subject: Account deleted account_reset_granted: button: Yes, continue deleting cancel_link_text: please cancel - help_html: If you don’t want to delete your account, %{cancel_account_reset}. + help_html: If you don’t want to delete your account, %{cancel_account_reset_html}. intro_html: Your 24 hour waiting period has ended. Please complete step 2 of the process.

If you’ve been unable to locate your authentication methods, select “confirm deletion” to delete your %{app_name} @@ -42,7 +42,7 @@ en: contact_link: contact us intro_html: You successfully verified your identity with %{sp_name} on %{date} using %{app_name}. If you did not perform this action, please - %{contact_link} and sign in to %{change_password_link}. + %{contact_link_html} and sign in to %{change_password_link_html}. subject: You verified your identity with %{sp_name}. add_email: footer: This link will expire in %{confirmation_period}. @@ -51,14 +51,14 @@ en: subject: Confirm your email add_email_associated_with_another_account: help_html: If you did not request a new email or suspect an error, please visit - the %{app_name} %{help_link} or %{contact_link}. - intro_html: This email address is already associated with a %{app_name} account, - so we can’t add it to another account. You must first delete or remove - it from the account it is associated with. To do this, follow the link - below and sign in with this email address. If you are not trying to add - this email address to an account, you can ignore this message. + the %{app_name_html} %{help_link_html} or %{contact_link_html}. + intro_html: This email address is already associated with a %{app_name_html} + account, so we can’t add it to another account. You must first delete or + remove it from the account it is associated with. To do this, follow the + link below and sign in with this email address. If you are not trying to + add this email address to an account, you can ignore this message. link_text: Go to %{app_name} - reset_password_html: If you can’t remember your password, go to %{app_name} to reset it. + reset_password_html: If you can’t remember your password, go to %{app_name_html} to reset it. contact_link_text: contact us email_added: header: A new email address was added to your %{app_name} profile. @@ -85,7 +85,7 @@ en: email_deleted: header: An email address was deleted from your %{app_name} profile. help_html: If you did not want to delete this email address, please visit the - %{app_name} %{help_link} or %{contact_link}. + %{app_name_html} %{help_link_html} or %{contact_link_html}. subject: Email address deleted help_link_text: Help Center in_person_completion_survey: @@ -190,20 +190,22 @@ en: letter_reminder: info_html: The letter you are about to receive will contain a one-time code that helps us verify your address. You can complete the identity verification - process by signing into %{link} and entering the one-time code. + process by signing into %{link_html} and entering the one-time code. subject: We mailed a letter to the address you have on file new_device_sign_in: disavowal_link: reset your password - help_html: If you did not make this change, %{disavowal_link}. For more help, - please visit the %{app_name} %{help_link} or %{contact_link}. + help_html: If you did not make this change, %{disavowal_link_html}. For more + help, please visit the %{app_name_html} %{help_link_html} or + %{contact_link_html}. info_html: '

Your %{app_name} account was just used to sign in on a new device.


%{date}
%{location}

' subject: New sign-in with your %{app_name} account password_changed: disavowal_link: reset your password - help_html: If you did not make this change, %{disavowal_link}. For more help, - please visit the %{app_name} %{help_link} or %{contact_link}. - intro_html: You have a new password for your %{app_name} account. + help_html: If you did not make this change, %{disavowal_link_html}. For more + help, please visit the %{app_name_html} %{help_link_html} or + %{contact_link_html}. + intro_html: You have a new password for your %{app_name_html} account. personal_key_regenerated: help_html:

Your %{app_name} account was just issued a new 16-character personal key. You’re getting this email to make sure it was @@ -246,8 +248,8 @@ en: subject: Account Security Alert phone_added: disavowal_link: reset your password - help: If you did not make this change, sign in to your profile and manage your - phone numbers. We also recommend that you %{disavowal_link}. + help_html: If you did not make this change, sign in to your profile and manage + your phone numbers. We also recommend that you %{disavowal_link_html}. intro: A new phone number was added to your %{app_name} profile. subject: New phone number added please_reset_password: @@ -277,13 +279,13 @@ en: subject: Reset your password signup_with_your_email: help_html: If you did not request a new account or suspect an error, please - visit the %{app_name} %{help_link} or %{contact_link}. - intro_html: This email address is already associated with a %{app_name} account, - so we can’t use it to create a new account. To sign in with your - existing account, follow the link below. If you are not trying to sign - in with this email address, you can ignore this message. + visit the %{app_name_html} %{help_link_html} or %{contact_link_html}. + intro_html: This email address is already associated with a %{app_name_html} + account, so we can’t use it to create a new account. To sign in with + your existing account, follow the link below. If you are not trying to + sign in with this email address, you can ignore this message. link_text: Go to %{app_name} - reset_password_html: If you can’t remember your password, go to %{app_name} to reset it. + reset_password_html: If you can’t remember your password, go to %{app_name_html} to reset it. suspended_reset_password: message: There was an issue resetting your password. Please give our contact center a call at %{contact_number} and provide this code - diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml index dfe89bf2622..b4d97f25cc9 100644 --- a/config/locales/user_mailer/es.yml +++ b/config/locales/user_mailer/es.yml @@ -2,22 +2,22 @@ es: user_mailer: account_rejected: - intro_html: No hemos podido verificar su identidad con %{app_name}. Por favor, + intro: No hemos podido verificar su identidad con %{app_name}. Por favor, póngase en contacto con la agencia a cuyo servicio está intentando acceder. subject: No hemos podido verificar su identidad account_reset_cancel: intro_html: Este correo electrónico confirma que ha cancelado su solicitud para - eliminar su cuenta de %{app_name}. + eliminar su cuenta de %{app_name_html}. subject: Solicitud cancelada account_reset_complete: intro_html: Este correo electrónico confirma que ha eliminado su cuenta de - %{app_name}. + %{app_name_html}. subject: Cuenta borrada account_reset_granted: button: Sí, continúa eliminando cancel_link_text: por favor cancele - help_html: Si no desea eliminar su cuenta, %{cancel_account_reset}. + help_html: Si no desea eliminar su cuenta, %{cancel_account_reset_html}. intro_html: Su período de espera de 24 horas ha finalizado. Complete el paso 2 del proceso.

Si no ha podido localizar sus métodos de autenticación, seleccione “confirmar eliminación” para eliminar su @@ -45,7 +45,7 @@ es: contact_link: contacto con nosotros intro_html: Verificaste correctamente tu identidad con %{sp_name} el %{date} a través de %{app_name}. Si no realizaste esta acción, ponte en - %{contact_link} e inicia sesión para %{change_password_link}. + %{contact_link_html} e inicia sesión para %{change_password_link_html}. subject: Verificaste tu identidad con %{sp_name} add_email: footer: Este enlace expira en %{confirmation_period}. @@ -54,15 +54,15 @@ es: subject: Confirme su correo electrónico add_email_associated_with_another_account: help_html: Si no solicitó un nuevo correo electrónico o sospecha de un error, - visite %{app_name} %{help_link} o %{contact_link}. + visite %{app_name_html} %{help_link_html} o %{contact_link_html}. intro_html: Esta dirección de correo electrónico ya está asociada con una cuenta - %{app_name}, por lo que no podemos agregarla a otra cuenta. Primero debe - eliminarlo o eliminarlo de la cuenta con la que está asociado. Para + %{app_name_html}, por lo que no podemos agregarla a otra cuenta. Primero + debe eliminarlo o eliminarlo de la cuenta con la que está asociado. Para hacer esto, siga el enlace de abajo e inicie sesión con esta dirección de correo electrónico. Si no está intentando agregar esta dirección de correo electrónico a una cuenta, puede ignorar este mensaje. link_text: Ir a %{app_name} - reset_password_html: Si no recuerda su contraseña, vaya a %{app_name} para restablecerla. + reset_password_html: Si no recuerda su contraseña, vaya a %{app_name_html} para restablecerla. contact_link_text: Contáctenos email_added: header: Se agregó una nueva dirección de correo electrónico a su perfil de @@ -92,7 +92,7 @@ es: header: Se eliminó una dirección de correo electrónico de su perfil de %{app_name}. help_html: Si no desea eliminar esta dirección de correo electrónico, visite el - %{app_name} %{help_link} o el %{contact_link}. + %{app_name_html} %{help_link_html} o el %{contact_link_html}. subject: Dirección de correo electrónico eliminada help_link_text: Centro de Ayuda in_person_completion_survey: @@ -206,22 +206,22 @@ es: letter_reminder: info_html: La carta que está a punto de recibir contendrá un código único que nos ayudará a verificar su dirección. Puede completar el proceso de - verificación de identidad iniciando sesión en %{link} e ingresando el - código único. + verificación de identidad iniciando sesión en %{link_html} e ingresando + el código único. subject: Le enviamos una carta a la dirección que tiene archivada new_device_sign_in: disavowal_link: restablecer su contraseña - help_html: Si no realizó este cambio, %{disavowal_link}. Para más ayuda, visite - el %{app_name} %{help_link} o el %{contact_link}. + help_html: Si no realizó este cambio, %{disavowal_link_html}. Para más ayuda, + visite el %{app_name_html} %{help_link_html} o el %{contact_link_html}. info_html: '

Su cuenta %{app_name} acaba de iniciar sesión en un nuevo dispositivo.



%{date}
%{location}

' subject: Nuevo initio de sesion con su %{app_name} cuenta password_changed: disavowal_link: restablecer su contraseña - help_html: Si no realizó este cambio, %{disavowal_link}. Para más ayuda, visite - el %{app_name} %{help_link} o el %{contact_link}. - intro_html: Tiene una contraseña nueva para su cuenta de %{app_name}. + help_html: Si no realizó este cambio, %{disavowal_link_html}. Para más ayuda, + visite el %{app_name_html} %{help_link_html} o el %{contact_link_html}. + intro_html: Tiene una contraseña nueva para su cuenta de %{app_name_html}. personal_key_regenerated: help_html:

Tu cuenta de %{app_name} acaba de emitir una nueva clave personal de 16 caracteres. Estás recibiendo este correo electrónico para @@ -265,8 +265,9 @@ es: subject: Alerta de seguridad de cuenta phone_added: disavowal_link: restablezca su contraseña - help: Si no realizó este cambio, inicie sesión en su perfil y administre sus - números de teléfono. También le recomendamos que %{disavowal_link}. + help_html: Si no realizó este cambio, inicie sesión en su perfil y administre + sus números de teléfono. También le recomendamos que + %{disavowal_link_html}. intro: Se agregó un nuevo número de teléfono a su perfil de %{app_name}. subject: Nuevo número de teléfono añadido please_reset_password: @@ -297,13 +298,13 @@ es: subject: Restablezca su contraseña. signup_with_your_email: help_html: Si no solicitó una cuenta nueva o sospecha un error, visite el - %{app_name} %{help_link} o el %{contact_link}. - intro_html: Este email ya está asociado a una cuenta %{app_name}, por lo tanto - no podemos usarlo para crear una cuenta nueva. Para iniciar una sesión - con su cuenta existente, siga el siguiente enlace. Si no intenta iniciar - una sesión con este email, puede ignorar este mensaje. + %{app_name_html} %{help_link_html} o el %{contact_link_html}. + intro_html: Este email ya está asociado a una cuenta %{app_name_html}, por lo + tanto no podemos usarlo para crear una cuenta nueva. Para iniciar una + sesión con su cuenta existente, siga el siguiente enlace. Si no intenta + iniciar una sesión con este email, puede ignorar este mensaje. link_text: Ir a %{app_name} - reset_password_html: Si no recuerda su contraseña, vaya a %{app_name} para restablecerla. + reset_password_html: Si no recuerda su contraseña, vaya a %{app_name_html} para restablecerla. suspended_reset_password: message: Se produjo un problema al restablecer su contraseña. Llame a nuestro centro de atención al número %{contact_number} y proporcione este código diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml index c4575e15f2a..2478e68530e 100644 --- a/config/locales/user_mailer/fr.yml +++ b/config/locales/user_mailer/fr.yml @@ -2,20 +2,21 @@ fr: user_mailer: account_rejected: - intro_html: Nous n’avons pas pu vérifier votre identité avec %{app_name}. - Veuillez contacter l’agence dont vous essayez d’accéder au service. + intro: Nous n’avons pas pu vérifier votre identité avec %{app_name}. Veuillez + contacter l’agence dont vous essayez d’accéder au service. subject: Nous n’avons pas pu vérifier votre identité account_reset_cancel: intro_html: Cet e-mail confirme que vous avez annulé votre demande de - suppression de votre compte %{app_name}. + suppression de votre compte %{app_name_html}. subject: Demande annulée account_reset_complete: - intro_html: Cet e-mail confirme que vous avez supprimé votre compte %{app_name}. + intro_html: Cet e-mail confirme que vous avez supprimé votre compte %{app_name_html}. subject: Compte supprimé account_reset_granted: button: Oui, continuez la suppression cancel_link_text: veuillez annuler - help_html: Si vous ne souhaitez pas supprimer votre compte, %{cancel_account_reset}. + help_html: Si vous ne souhaitez pas supprimer votre compte, + %{cancel_account_reset_html}. intro_html: Votre période d’attente de 24 heures est terminée. Veuillez terminer l’étape 2 du processus.

Si vous ne parvenez pas à localiser vos méthodes d’authentification, sélectionnez “confirmer la suppression” @@ -44,8 +45,8 @@ fr: contact_link: nous contacter intro_html: Vous avez vérifié avec succès votre identité auprès de %{sp_name} le %{date} en utilisant %{app_name}. Si vous n’avez pas effectué cette - action, veuillez %{contact_link} et vous connecter pour - %{change_password_link}. + action, veuillez %{contact_link_html} et vous connecter pour + %{change_password_link_html}. subject: Vous avez vérifié votre identité avec %{sp_name} add_email: footer: Ce lien expirera dans %{confirmation_period}. @@ -54,16 +55,17 @@ fr: subject: Confirmez votre email add_email_associated_with_another_account: help_html: Si vous n’avez pas demandé de nouvel email ou que vous suspectez une - erreur, veuillez visiter le %{app_name} %{help_link} ou %{contact_link}. + erreur, veuillez visiter le %{app_name_html} %{help_link_html} ou + %{contact_link_html}. intro_html: Cette adresse électronique est déjà associée à un compte - %{app_name}, nous ne pouvons donc pas l’ajouter à un autre compte. Vous - devez d’abord le supprimer ou le supprimer du compte auquel il est + %{app_name_html}, nous ne pouvons donc pas l’ajouter à un autre compte. + Vous devez d’abord le supprimer ou le supprimer du compte auquel il est associé. Pour ce faire, suivez le lien ci-dessous et connectez-vous avec cette adresse e-mail. Si vous n’essayez pas d’ajouter cette adresse électronique à un compte, vous pouvez ignorer ce message. link_text: Allez à %{app_name} reset_password_html: Si vous ne vous souvenez plus de votre mot de passe, allez - à %{app_name} pour le réinitialiser. + à %{app_name_html} pour le réinitialiser. contact_link_text: communiquez avec nous email_added: header: Une nouvelle adresse e-mail a été ajoutée à votre profil %{app_name}. @@ -93,7 +95,8 @@ fr: email_deleted: header: Une adresse email a été supprimée de votre profil %{app_name}. help_html: Si vous ne souhaitez pas supprimer cette adresse électronique - veuillez visiter le %{help_link} de %{app_name} ou %{contact_link}. + veuillez visiter le %{help_link_html} de %{app_name_html} ou + %{contact_link_html}. subject: Adresse email supprimée help_link_text: Centre d’aide in_person_completion_survey: @@ -208,22 +211,22 @@ fr: info_html: La lettre que vous êtes sur le point de recevoir contiendra un code à usage unique nous permettant de vérifier votre adresse. Vous pouvez terminer le processus de vérification d’identité en vous connectant à - %{link} et en entrant le code à usage unique. + %{link_html} et en entrant le code à usage unique. subject: Nous avons envoyé une lettre à l’adresse que vous avez en dossier new_device_sign_in: disavowal_link: réinitialiser votre mot de passe - help_html: Si vous n’avez pas effectué ce changement, %{disavowal_link}. Pour - plus d’aide, veuillez visiter le %{help_link} de %{app_name} ou - %{contact_link}. + help_html: Si vous n’avez pas effectué ce changement, %{disavowal_link_html}. + Pour plus d’aide, veuillez visiter le %{help_link_html} de + %{app_name_html} ou %{contact_link_html}. info_html: '

Votre compte %{app_name} a été connecté sur un nouvel appareil.



%{date}
%{location}

' subject: Nouvelle connexion avec votre compte %{app_name} password_changed: disavowal_link: réinitialiser votre mot de passe - help_html: Si vous n’avez pas effectué ce changement, %{disavowal_link}. Pour - plus d’aide, veuillez visiter le %{help_link} de %{app_name} ou - %{contact_link}. - intro_html: Le mot de passe de votre compte %{app_name} a été changé. + help_html: Si vous n’avez pas effectué ce changement, %{disavowal_link_html}. + Pour plus d’aide, veuillez visiter le %{help_link_html} de + %{app_name_html} ou %{contact_link_html}. + intro_html: Le mot de passe de votre compte %{app_name_html} a été changé. personal_key_regenerated: help_html:

Votre compte %{app_name} vient de recevoir une nouvelle clé personnelle de 16 caractères. Le but de cet e-mail est de s’assurer que @@ -271,9 +274,9 @@ fr: subject: Alerte de sécurité du compte phone_added: disavowal_link: réinitialiser votre mot de passe - help: Si vous n’avez pas apporté cette modification, connectez-vous à votre + help_html: Si vous n’avez pas apporté cette modification, connectez-vous à votre profil et gérez vos numéros de téléphone. Nous vous recommandons - également de %{disavowal_link}. + également de %{disavowal_link_html}. intro: Un nouveau numéro de téléphone a été ajouté à votre profil %{app_name}. subject: Nouveau numéro de téléphone ajouté please_reset_password: @@ -306,16 +309,16 @@ fr: subject: Réinitialisez votre mot de passe signup_with_your_email: help_html: Si vous n’avez pas demandé un nouveau compte ou que vous soupçonnez - qu’une erreur s’est produite, veuillez visiter le %{help_link} de - %{app_name} ou %{contact_link}. - intro_html: Cette adresse courriel est déjà associée à un compte %{app_name}, - nous ne pouvons donc pas l’utiliser pour créer un nouveau compte. Pour - vous connecter à votre compte existant, suivez le lien ci-dessous. Si - vous ne tentez pas de vous connecter avec cette adresse courriel, vous - pouvez ignorer ce message. + qu’une erreur s’est produite, veuillez visiter le %{help_link_html} de + %{app_name_html} ou %{contact_link_html}. + intro_html: Cette adresse courriel est déjà associée à un compte + %{app_name_html}, nous ne pouvons donc pas l’utiliser pour créer un + nouveau compte. Pour vous connecter à votre compte existant, suivez le + lien ci-dessous. Si vous ne tentez pas de vous connecter avec cette + adresse courriel, vous pouvez ignorer ce message. link_text: Allez à %{app_name} reset_password_html: Si vous ne vous souvenez plus de votre mot de passe, allez - à %{app_name} pour le réinitialiser. + à %{app_name_html} pour le réinitialiser. suspended_reset_password: message: La réinitialisation de votre mot de passe a posé un problème. Veuillez appeler notre centre d’appels au %{contact_number} et fournir ce code - diff --git a/config/locales/users/en.yml b/config/locales/users/en.yml index 2cd9beaacf9..f38607495a0 100644 --- a/config/locales/users/en.yml +++ b/config/locales/users/en.yml @@ -21,7 +21,7 @@ en: code_example: A personal key example with 16 characters preview: Personal key preview confirmation_error: You’ve entered an incorrect personal key. - generated_on_html: Your personal key was generated on %{date} + generated_on_html: Your personal key was generated on %{date_html} phones: error_message: You’ve added the maximum number of phone numbers. rules_of_use: @@ -34,5 +34,5 @@ en:

  • How we use your information and your rights to that information, and
  • The conditions you agree to when you take certain actions on the %{app_name} service.
    • - overview_html: We’ve updated our %{link}. Please review and check the box below - to continue. + overview_html: We’ve updated our %{link_html}. Please review and check the box + below to continue. diff --git a/config/locales/users/es.yml b/config/locales/users/es.yml index 17c84ecd945..5e3ff4c2087 100644 --- a/config/locales/users/es.yml +++ b/config/locales/users/es.yml @@ -22,7 +22,7 @@ es: code_example: Un ejemplo de clave personal con 16 caracteres preview: Vista previa de la clave personal confirmation_error: Ha ingresado una clave personal incorrecta. - generated_on_html: Tu clave personal fue generada el %{date} + generated_on_html: Tu clave personal fue generada el %{date_html} phones: error_message: Agregó el número máximo de números de teléfono. rules_of_use: @@ -35,5 +35,5 @@ es:
  • Cómo usamos su información y sus derechos sobre esa información, y
  • Las condiciones que acepta cuando realiza determinadas acciones en el servicio %{app_name}.
    • - overview_html: Actualizamos nuestro %{link}. Revise y marque la casilla a + overview_html: Actualizamos nuestro %{link_html}. Revise y marque la casilla a continuación para continuar. diff --git a/config/locales/users/fr.yml b/config/locales/users/fr.yml index fb092a68f69..d92c09ca937 100644 --- a/config/locales/users/fr.yml +++ b/config/locales/users/fr.yml @@ -24,7 +24,7 @@ fr: code_example: Un exemple de code personnel à 16 caractères preview: Aperçu du code personnel confirmation_error: Vous avez entré un clé personnelle erronée. - generated_on_html: Votre clé personnelle a été générée le %{date} + generated_on_html: Votre clé personnelle a été générée le %{date_html} phones: error_message: Vous avez ajouté le nombre maximum de numéros de téléphone. rules_of_use: @@ -37,5 +37,5 @@ fr:
  • Comment nous utilisons vos informations et vos droits sur ces informations, et
  • Les conditions que vous acceptez lorsque vous effectuez certaines actions sur le service %{app_name}.
    • - overview_html: Nous avons mis à jour notre %{link}. Veuillez consulter et cocher - la case ci-dessous pour continuer. + overview_html: Nous avons mis à jour notre %{link_html}. Veuillez consulter et + cocher la case ci-dessous pour continuer. diff --git a/lib/custom_devise_failure_app.rb b/lib/custom_devise_failure_app.rb index ee9827e8954..53a7c270a3b 100644 --- a/lib/custom_devise_failure_app.rb +++ b/lib/custom_devise_failure_app.rb @@ -35,7 +35,7 @@ def customized_message(message) I18n.t("#{prefix}_link_text"), new_user_password_url(locale: locale_url_param, request_id: sp_session[:request_id]), ) - I18n.t("#{prefix}_html", link: link) + I18n.t("#{prefix}_html", link_html: link) end def helper diff --git a/spec/features/account_connected_apps_spec.rb b/spec/features/account_connected_apps_spec.rb index 421587e0d9d..702f3cdf3c2 100644 --- a/spec/features/account_connected_apps_spec.rb +++ b/spec/features/account_connected_apps_spec.rb @@ -45,7 +45,7 @@ expect(page).to have_content( \ t( 'event_types.authenticated_at_html', - service_provider_link: identity_with_link.display_name, + service_provider_link_html: identity_with_link.display_name, ), ) expect(page).to have_link( \ diff --git a/spec/features/account_history_spec.rb b/spec/features/account_history_spec.rb index 77ba5240efc..a5dd94df942 100644 --- a/spec/features/account_history_spec.rb +++ b/spec/features/account_history_spec.rb @@ -77,7 +77,7 @@ expect(page).to have_content( t( 'event_types.authenticated_at_html', - service_provider_link: identity_with_link.display_name, + service_provider_link_html: identity_with_link.display_name, ), ) expect(page).to have_link( diff --git a/spec/features/idv/doc_auth/redo_document_capture_spec.rb b/spec/features/idv/doc_auth/redo_document_capture_spec.rb index af274dc11e8..194bbd0f36b 100644 --- a/spec/features/idv/doc_auth/redo_document_capture_spec.rb +++ b/spec/features/idv/doc_auth/redo_document_capture_spec.rb @@ -36,7 +36,7 @@ '[role="status"]', text: t( 'doc_auth.headings.capture_scan_warning_html', - link: warning_link_text, + link_html: warning_link_text, ).tr(' ', ' '), ) click_link warning_link_text @@ -67,7 +67,7 @@ '[role="status"]', text: t( 'doc_auth.headings.capture_scan_warning_html', - link: warning_link_text, + link_html: warning_link_text, ).tr(' ', ' '), ) click_link warning_link_text @@ -128,7 +128,7 @@ '[role="status"]', text: t( 'doc_auth.headings.capture_scan_warning_html', - link: warning_link_text, + link_html: warning_link_text, ).tr(' ', ' '), ) click_link warning_link_text diff --git a/spec/features/idv/doc_auth/ssn_step_spec.rb b/spec/features/idv/doc_auth/ssn_step_spec.rb index 1862aba7b98..a3bbe9f2996 100644 --- a/spec/features/idv/doc_auth/ssn_step_spec.rb +++ b/spec/features/idv/doc_auth/ssn_step_spec.rb @@ -24,7 +24,7 @@ select 'Review', from: 'mock_profiling_result' - expect(page.find_field(t('idv.form.ssn_label_html'))['aria-invalid']).to eq('false') + expect(page.find_field(t('idv.form.ssn_label'))['aria-invalid']).to eq('false') click_idv_continue expect(page).to have_current_path(idv_verify_info_url) @@ -37,7 +37,7 @@ fill_out_ssn_form_fail click_idv_continue - expect(page.find_field(t('idv.form.ssn_label_html'))['aria-invalid']).to eq('true') + expect(page.find_field(t('idv.form.ssn_label'))['aria-invalid']).to eq('true') expect(page).to have_current_path(idv_ssn_url) end diff --git a/spec/features/idv/doc_auth/verify_info_step_spec.rb b/spec/features/idv/doc_auth/verify_info_step_spec.rb index db01993d916..2da11fc59e2 100644 --- a/spec/features/idv/doc_auth/verify_info_step_spec.rb +++ b/spec/features/idv/doc_auth/verify_info_step_spec.rb @@ -83,10 +83,10 @@ expect(page).to have_current_path(idv_ssn_path) expect(page).to_not have_content(t('doc_auth.headings.capture_complete')) expect( - find_field(t('idv.form.ssn_label_html')).value, + find_field(t('idv.form.ssn_label')).value, ).to eq(DocAuthHelper::GOOD_SSN.gsub(/\D/, '')) - fill_in t('idv.form.ssn_label_html'), with: '900456789' + fill_in t('idv.form.ssn_label'), with: '900456789' click_button t('forms.buttons.submit.update') expect(fake_analytics).to have_logged_event( @@ -276,10 +276,10 @@ expect(page).to have_current_path(idv_ssn_path) expect(page).to_not have_content(t('doc_auth.headings.capture_complete')) expect( - find_field(t('idv.form.ssn_label_html')).value, + find_field(t('idv.form.ssn_label')).value, ).not_to eq(DocAuthHelper::GOOD_SSN.gsub(/\D/, '')) - fill_in t('idv.form.ssn_label_html'), with: '900456789' + fill_in t('idv.form.ssn_label'), with: '900456789' click_button t('forms.buttons.submit.update') click_idv_continue diff --git a/spec/features/idv/in_person_spec.rb b/spec/features/idv/in_person_spec.rb index e0caa9fa4e0..b0c57b438dc 100644 --- a/spec/features/idv/in_person_spec.rb +++ b/spec/features/idv/in_person_spec.rb @@ -699,9 +699,7 @@ complete_address_step(user, double_address_verification: true) # Ensure the page submitted successfully - expect(page).to have_content( - t('idv.form.ssn_label_html'), - ) + expect(page).to have_content(t('idv.form.ssn_label')) end end @@ -739,9 +737,7 @@ # skip address step complete_ssn_step(user) # Ensure the page submitted successfully - expect(page).to have_content( - t('idv.form.ssn_label_html'), - ) + expect(page).to have_content(t('idv.form.ssn_label')) end it 'can redo the address page form even if that page is skipped' do diff --git a/spec/features/idv/puerto_rican_address_spec.rb b/spec/features/idv/puerto_rican_address_spec.rb index 054f0f2fefb..8bb24149a5b 100644 --- a/spec/features/idv/puerto_rican_address_spec.rb +++ b/spec/features/idv/puerto_rican_address_spec.rb @@ -33,7 +33,7 @@ expect(page).to have_current_path(idv_ssn_path) - fill_in t('idv.form.ssn_label_html'), with: '900456789' + fill_in t('idv.form.ssn_label'), with: '900456789' click_button t('forms.buttons.submit.update') expect(page).to have_current_path(idv_verify_info_path) 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 d9368d00f54..d22b0e71c35 100644 --- a/spec/features/idv/steps/in_person/verify_info_spec.rb +++ b/spec/features/idv/steps/in_person/verify_info_spec.rb @@ -122,7 +122,7 @@ # click update ssn button click_button t('idv.buttons.change_ssn_label') expect(page).to have_content(t('doc_auth.headings.ssn_update')) - fill_in t('idv.form.ssn_label_html'), with: '900-12-2345' + fill_in t('idv.form.ssn_label'), with: '900-12-2345' click_button t('forms.buttons.submit.update') expect(page).to have_content(t('headings.verify')) expect(page).to have_current_path(idv_in_person_verify_info_path) diff --git a/spec/features/legacy_passwords_spec.rb b/spec/features/legacy_passwords_spec.rb index 6bf31512c37..ee2fdda3960 100644 --- a/spec/features/legacy_passwords_spec.rb +++ b/spec/features/legacy_passwords_spec.rb @@ -32,7 +32,7 @@ expect(page).to have_current_path(new_user_session_path) expect(page).to have_content( - t('devise.failure.invalid_html', link: t('devise.failure.invalid_link_text')), + t('devise.failure.invalid_html', link_html: t('devise.failure.invalid_link_text')), ) end diff --git a/spec/features/multiple_emails/add_email_spec.rb b/spec/features/multiple_emails/add_email_spec.rb index b58300367c6..4cf06b60b1e 100644 --- a/spec/features/multiple_emails/add_email_spec.rb +++ b/spec/features/multiple_emails/add_email_spec.rb @@ -129,7 +129,10 @@ sign_in_user_and_add_email(user, false) expect(last_email_sent.default_part_body.to_s).to have_content( - t('user_mailer.add_email_associated_with_another_account.intro_html', app_name: APP_NAME), + t( + 'user_mailer.add_email_associated_with_another_account.intro_html', + app_name_html: APP_NAME, + ), ) expect_delivered_email_count(1) diff --git a/spec/features/multiple_emails/sign_in_spec.rb b/spec/features/multiple_emails/sign_in_spec.rb index 51e23203758..cbd291241ac 100644 --- a/spec/features/multiple_emails/sign_in_spec.rb +++ b/spec/features/multiple_emails/sign_in_spec.rb @@ -30,7 +30,10 @@ signin(email_address.email, user.password) - error_message = t('devise.failure.invalid_html', link: t('devise.failure.invalid_link_text')) + error_message = t( + 'devise.failure.invalid_html', + link_html: t('devise.failure.invalid_link_text'), + ) expect(page).to have_content(error_message) expect(page).to have_current_path(new_user_session_path) diff --git a/spec/features/phone/default_phone_selection_spec.rb b/spec/features/phone/default_phone_selection_spec.rb index 4e9297f4174..7239d270390 100644 --- a/spec/features/phone/default_phone_selection_spec.rb +++ b/spec/features/phone/default_phone_selection_spec.rb @@ -16,7 +16,7 @@ sign_in_before_2fa(user) expect(page).to have_content t( 'instructions.mfa.sms.number_message_html', - number: '(***) ***-1212', + number_html: '(***) ***-1212', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end @@ -37,7 +37,7 @@ expect(page).to have_content t( 'instructions.mfa.sms.number_message_html', - number: '+1 202-555-3434', + number_html: '+1 202-555-3434', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) @@ -50,7 +50,7 @@ sign_in_before_2fa(user) expect(page).to have_content t( 'instructions.mfa.sms.number_message_html', - number: '(***) ***-3434', + number_html: '(***) ***-3434', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end @@ -89,7 +89,7 @@ sign_in_before_2fa(user) expect(page).to have_content t( 'instructions.mfa.sms.number_message_html', - number: '(***) ***-3111', + number_html: '(***) ***-3111', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end @@ -108,7 +108,7 @@ expect(page).to have_content t( 'instructions.mfa.voice.number_message_html', - number: '+1 202-555-3434', + number_html: '+1 202-555-3434', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) @@ -121,7 +121,7 @@ sign_in_before_2fa(user) expect(page).to have_content t( 'instructions.mfa.voice.number_message_html', - number: '(***) ***-3434', + number_html: '(***) ***-3434', expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end diff --git a/spec/features/users/piv_cac_management_spec.rb b/spec/features/users/piv_cac_management_spec.rb index eb42aa07787..5b6f67e76f3 100644 --- a/spec/features/users/piv_cac_management_spec.rb +++ b/spec/features/users/piv_cac_management_spec.rb @@ -107,7 +107,7 @@ def find_form(page, attributes) expect(page).to have_content( t( 'instructions.mfa.piv_cac.no_certificate_html', - try_again: t('instructions.mfa.piv_cac.try_again'), + try_again_html: t('instructions.mfa.piv_cac.try_again'), ), ) end @@ -135,7 +135,7 @@ def find_form(page, attributes) expect(page).to have_content( t( 'instructions.mfa.piv_cac.did_not_work_html', - please_try_again: t('instructions.mfa.piv_cac.please_try_again'), + please_try_again_html: t('instructions.mfa.piv_cac.please_try_again'), ), ) end diff --git a/spec/features/visitors/bad_password_spec.rb b/spec/features/visitors/bad_password_spec.rb index b562a13a1b7..7c93b499149 100644 --- a/spec/features/visitors/bad_password_spec.rb +++ b/spec/features/visitors/bad_password_spec.rb @@ -6,7 +6,10 @@ scenario 'visitor tries too many bad passwords gets locked out then waits window seconds' do visit new_user_session_path - error_message = t('devise.failure.invalid_html', link: t('devise.failure.invalid_link_text')) + error_message = t( + 'devise.failure.invalid_html', + link_html: t('devise.failure.invalid_link_text'), + ) IdentityConfig.store.max_bad_passwords.times do fill_in_credentials_and_submit(bad_email, bad_password) expect(page).to have_content(error_message) diff --git a/spec/features/visitors/sign_up_with_email_spec.rb b/spec/features/visitors/sign_up_with_email_spec.rb index b9aaf9316bf..ee559e7d763 100644 --- a/spec/features/visitors/sign_up_with_email_spec.rb +++ b/spec/features/visitors/sign_up_with_email_spec.rb @@ -47,7 +47,7 @@ to change { ActionMailer::Base.deliveries.count }.by(1) expect(last_email.html_part.body).to have_content( - t('user_mailer.signup_with_your_email.intro_html', app_name: APP_NAME), + t('user_mailer.signup_with_your_email.intro_html', app_name_html: APP_NAME), ) end end diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb index ef3f2601abe..94b0a90ccfa 100644 --- a/spec/i18n_spec.rb +++ b/spec/i18n_spec.rb @@ -108,59 +108,104 @@ def allowed_untranslated_key?(locale, key) root_dir = File.expand_path(File.join(File.dirname(__FILE__), '../')) - Dir[File.join(root_dir, '/config/locales/**/*.yml')].each do |full_path| - i18n_file = full_path.sub("#{root_dir}/", '') - - describe i18n_file do - # Transliteration includes special characters by definition, so it could fail the below checks - if !full_path.match?(%(/config/locales/transliterate/)) - it 'has only lower_snake_case keys' do - keys = flatten_hash(YAML.load_file(full_path)).keys + Dir[File.join(root_dir, '/config/locales/**')].sort.each do |group_path| + i18n_group = group_path.sub("#{root_dir}/", '') + + describe i18n_group do + it 'has HTML inside at least one locale string for all keys with .html or _html ' do + combined = Hash.new { |h, k| h[k] = {} } + + Dir["#{group_path}/**.yml"].each do |file| + locale, data = YAML.load_file(file).first + flatten_hash(data).each do |key, str| + combined[key][locale] = str + end + end - bad_keys = keys.reject { |key| key =~ /^[a-z0-9_.]+$/ } + bad_keys = combined.select do |key, locales| + next if locales.values.all?(&:blank?) - expect(bad_keys).to be_empty + key.include?('html') ^ contains_html?(locales.values) end - it 'has only has XML-safe identifiers (keys start with a letter)' do - keys = flatten_hash(YAML.load_file(full_path)).keys + expect(bad_keys).to be_empty + end + end - bad_keys = keys.select { |key| key.split('.').any? { |part| part =~ /^[0-9]/ } } + Dir["#{group_path}/*.yml"].each do |full_path| + i18n_file = full_path.sub("#{root_dir}/", '') - expect(bad_keys).to be_empty - end - end + describe i18n_file do + # Transliteration includes special characters by definition, so it could fail checks below + if !full_path.match?(%(/config/locales/transliterate/)) + it 'has only lower_snake_case keys' do + keys = flatten_hash(YAML.load_file(full_path)).keys - it 'has correctly-formatted interpolation values' do - bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| - next unless value.is_a?(String) + bad_keys = keys.reject { |key| key =~ /^[a-z0-9_.]+$/ } - interpolation_names = value.scan(/%\{([^}]+)\}/).flatten + expect(bad_keys).to be_empty + end - interpolation_names.any? { |name| name.downcase != name } + it 'has only has XML-safe identifiers (keys start with a letter)' do + keys = flatten_hash(YAML.load_file(full_path)).keys + + bad_keys = keys.select { |key| key.split('.').any? { |part| part =~ /^[0-9]/ } } + + expect(bad_keys).to be_empty + end end - expect(bad_keys).to be_empty - end + it 'has correctly-formatted interpolation values' do + bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| + next unless value.is_a?(String) - it 'does not contain any translations expecting legacy fallback behavior' do - bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| - value.include?('NOT TRANSLATED YET') + interpolation_names = value.scan(/%\{([^}]+)\}/).flatten + + interpolation_names.any? { |name| name.downcase != name } + end + + expect(bad_keys).to be_empty end - expect(bad_keys).to be_empty - end + it 'does not contain any translations expecting legacy fallback behavior' do + bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| + value.include?('NOT TRANSLATED YET') + end - it 'does not contain any translations that hardcode APP_NAME' do - bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| - value.include?(APP_NAME) + expect(bad_keys).to be_empty end - expect(bad_keys).to be_empty + it 'does not contain any translations that hardcode APP_NAME' do + bad_keys = flatten_hash(YAML.load_file(full_path)).select do |_key, value| + value.include?(APP_NAME) + end + + expect(bad_keys).to be_empty + end end end end + def contains_html?(value) + Array(value).flatten.compact.any? do |str| + html_tags?(str) || html_entities?(str) || likely_html_interpolation?(str) + end + end + + def html_tags?(str) + str.scan(/<.+?>/).present? + end + + def html_entities?(str) + str.scan(/&[^;]+?;/).present? + end + + def likely_html_interpolation?(str) + str.scan(I18n::INTERPOLATION_PATTERN).flatten.compact.any? do |key| + key =~ /html/ + end + end + def extract_interpolation_arguments(translation) translation.scan(I18n::INTERPOLATION_PATTERN). map(&:compact).map(&:first).to_set diff --git a/spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx b/spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx index 7258d71eb0f..6457e126011 100644 --- a/spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx +++ b/spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx @@ -762,7 +762,7 @@ describe('document-capture/components/acuant-capture', () => { value={ new I18n({ strings: { - 'doc_auth.buttons.take_or_upload_picture': 'Upload', + 'doc_auth.buttons.take_or_upload_picture_html': 'Upload', }, }) } @@ -790,7 +790,7 @@ describe('document-capture/components/acuant-capture', () => { value={ new I18n({ strings: { - 'doc_auth.buttons.take_or_upload_picture': 'Upload', + 'doc_auth.buttons.take_or_upload_picture_html': 'Upload', }, }) } @@ -935,7 +935,9 @@ describe('document-capture/components/acuant-capture', () => { Upload' }, + strings: { + 'doc_auth.buttons.take_or_upload_picture_html': 'Upload', + }, }) } > diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 13f95464e00..ff31538d80a 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -107,7 +107,7 @@ it 'renders the body' do expect(mail.html_part.body).to have_content( - t('user_mailer.password_changed.intro_html', app_name: APP_NAME), + t('user_mailer.password_changed.intro_html', app_name_html: APP_NAME), ) expect(mail.html_part.body).to include( '/events/disavow?disavowal_token=123abc', @@ -272,7 +272,7 @@ expect(mail.html_part.body).to have_content( I18n.t( 'user_mailer.signup_with_your_email.intro_html', - app_name: APP_NAME, + app_name_html: APP_NAME, ), ) expect_email_body_to_have_help_and_contact_links @@ -415,7 +415,7 @@ def expect_email_body_to_have_help_and_contact_links it 'renders the body' do expect(mail.html_part.body). to have_content( - strip_tags(t('user_mailer.account_reset_complete.intro_html', app_name: APP_NAME)), + strip_tags(t('user_mailer.account_reset_complete.intro_html', app_name_html: APP_NAME)), ) end end @@ -440,7 +440,7 @@ def expect_email_body_to_have_help_and_contact_links it 'renders the body' do expect(mail.html_part.body). to have_content( - strip_tags(t('user_mailer.account_reset_cancel.intro_html', app_name: APP_NAME)), + strip_tags(t('user_mailer.account_reset_cancel.intro_html', app_name_html: APP_NAME)), ) end end @@ -486,7 +486,7 @@ def expect_email_body_to_have_help_and_contact_links it 'renders the body' do expect(mail.html_part.body). - to have_content(strip_tags(t('user_mailer.letter_reminder.info_html', link: APP_NAME))) + to have_content(strip_tags(t('user_mailer.letter_reminder.info_html', link_html: APP_NAME))) end it 'does not send mail to emails in nonessential email banlist' do diff --git a/spec/presenters/idv/cancellations_presenter_spec.rb b/spec/presenters/idv/cancellations_presenter_spec.rb index 48a05bbc3b7..1ab63471ff5 100644 --- a/spec/presenters/idv/cancellations_presenter_spec.rb +++ b/spec/presenters/idv/cancellations_presenter_spec.rb @@ -49,7 +49,7 @@ 'idv.cancel.description.exit.with_sp_html', app_name: APP_NAME, sp_name: sp_name, - account_page_link: link_to(t('idv.cancel.description.account_page'), account_path), + account_page_link_html: link_to(t('idv.cancel.description.account_page'), account_path), ) end end diff --git a/spec/presenters/piv_cac_error_presenter_spec.rb b/spec/presenters/piv_cac_error_presenter_spec.rb index 504d44e2076..74c831f745f 100644 --- a/spec/presenters/piv_cac_error_presenter_spec.rb +++ b/spec/presenters/piv_cac_error_presenter_spec.rb @@ -27,7 +27,7 @@ let(:expected_description) do t( 'instructions.mfa.piv_cac.no_certificate_html', - try_again: view.link_to(t('instructions.mfa.piv_cac.try_again'), ''), + try_again_html: view.link_to(t('instructions.mfa.piv_cac.try_again'), ''), ) end diff --git a/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb b/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb index 03141df67c1..b0a7b983c28 100644 --- a/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb +++ b/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb @@ -50,7 +50,7 @@ it 'specifies when the code will expire' do text = t( 'instructions.mfa.sms.number_message_html', - number: ActionController::Base.helpers.content_tag(:strong, data[:phone_number]), + number_html: ActionController::Base.helpers.content_tag(:strong, data[:phone_number]), expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) expect(presenter.phone_number_message).to eq text diff --git a/spec/presenters/two_factor_auth_code/piv_cac_authentication_presenter_spec.rb b/spec/presenters/two_factor_auth_code/piv_cac_authentication_presenter_spec.rb index 5f449950139..38bcadca7f7 100644 --- a/spec/presenters/two_factor_auth_code/piv_cac_authentication_presenter_spec.rb +++ b/spec/presenters/two_factor_auth_code/piv_cac_authentication_presenter_spec.rb @@ -37,12 +37,7 @@ let(:piv_cac_required) { false } it 'returns help text' do - expected_help_text = t( - 'instructions.mfa.piv_cac.confirm_piv_cac_html', - email: content_tag(:strong, user_email), - app_name: content_tag(:strong, APP_NAME), - ) - expect(presenter.piv_cac_help).to eq expected_help_text + expect(presenter.piv_cac_help).to eq(t('instructions.mfa.piv_cac.confirm_piv_cac')) end context 'with PIV/CAC only requested' do @@ -54,7 +49,7 @@ it 'returns the PIV only help text' do expect(presenter.piv_cac_help).to eq( - t('instructions.mfa.piv_cac.confirm_piv_cac_only_html'), + t('instructions.mfa.piv_cac.confirm_piv_cac_only'), ) end end @@ -64,7 +59,7 @@ it 'returns the PIV only help text' do expect(presenter.piv_cac_help).to eq( - t('instructions.mfa.piv_cac.confirm_piv_cac_only_html'), + t('instructions.mfa.piv_cac.confirm_piv_cac_only'), ) end end @@ -79,7 +74,7 @@ it 'returns the PIV only help text' do expect(presenter.piv_cac_help).to eq( - t('instructions.mfa.piv_cac.confirm_piv_cac_only_html'), + t('instructions.mfa.piv_cac.confirm_piv_cac_only'), ) end end @@ -89,7 +84,7 @@ it 'returns the PIV or phishing-resistant help text' do expect(presenter.piv_cac_help).to eq( - t('instructions.mfa.piv_cac.confirm_piv_cac_or_aal3_html'), + t('instructions.mfa.piv_cac.confirm_piv_cac_or_aal3'), ) end end diff --git a/spec/presenters/two_factor_auth_code/webauthn_authentication_presenter_spec.rb b/spec/presenters/two_factor_auth_code/webauthn_authentication_presenter_spec.rb index cba2c3decac..d353fe9a6e1 100644 --- a/spec/presenters/two_factor_auth_code/webauthn_authentication_presenter_spec.rb +++ b/spec/presenters/two_factor_auth_code/webauthn_authentication_presenter_spec.rb @@ -37,7 +37,7 @@ it 'returns the help text for just the security key' do expect(presenter.webauthn_help).to eq( - t('instructions.mfa.webauthn.confirm_webauthn_only_html'), + t('instructions.mfa.webauthn.confirm_webauthn_only'), ) end end @@ -47,7 +47,7 @@ it 'returns the help text for the security key or PIV' do expect(presenter.webauthn_help).to eq( - t('instructions.mfa.webauthn.confirm_webauthn_or_aal3_html'), + t('instructions.mfa.webauthn.confirm_webauthn_or_aal3'), ) end end @@ -58,7 +58,7 @@ it 'displays the help text' do expect(presenter.webauthn_help).to eq( - t('instructions.mfa.webauthn.confirm_webauthn_html'), + t('instructions.mfa.webauthn.confirm_webauthn'), ) end end @@ -68,7 +68,10 @@ it 'returns the help text for a platform authenticator' do expect(presenter.webauthn_help).to eq( - t('instructions.mfa.webauthn.confirm_webauthn_platform_html', app_name: APP_NAME), + t( + 'instructions.mfa.webauthn.confirm_webauthn_platform', + app_name: APP_NAME, + ), ) end end diff --git a/spec/presenters/two_factor_login_options_presenter_spec.rb b/spec/presenters/two_factor_login_options_presenter_spec.rb index 9dbedde7a9d..a7003564adc 100644 --- a/spec/presenters/two_factor_login_options_presenter_spec.rb +++ b/spec/presenters/two_factor_login_options_presenter_spec.rb @@ -37,14 +37,13 @@ allow_any_instance_of(TwoFactorLoginOptionsPresenter).to \ receive(:account_reset_token).and_return('foo') - expect(presenter.account_reset_or_cancel_link).to eq \ - t( - 'two_factor_authentication.account_reset.pending_html', - cancel_link: view.link_to( + expect(presenter.account_reset_or_cancel_link).to eq( + t('two_factor_authentication.account_reset.pending') + ' ' + + view.link_to( t('two_factor_authentication.account_reset.cancel_link'), account_reset_cancel_url(token: 'foo'), ), - ) + ) end it 'supplies a reset link when the token is not valid' do @@ -54,7 +53,7 @@ expect(presenter.account_reset_or_cancel_link).to eq \ t( 'two_factor_authentication.account_reset.text_html', - link: view.link_to( + link_html: view.link_to( t('two_factor_authentication.account_reset.link'), account_reset_recovery_options_path(locale: LinkLocaleResolver.locale), ), diff --git a/spec/support/features/doc_auth_helper.rb b/spec/support/features/doc_auth_helper.rb index d947dc85bb2..69126ab51cf 100644 --- a/spec/support/features/doc_auth_helper.rb +++ b/spec/support/features/doc_auth_helper.rb @@ -17,19 +17,19 @@ def clear_and_fill_in(field_name, text) end def fill_out_ssn_form_with_ssn_that_fails_resolution - fill_in t('idv.form.ssn_label_html'), with: SSN_THAT_FAILS_RESOLUTION + fill_in t('idv.form.ssn_label'), with: SSN_THAT_FAILS_RESOLUTION end def fill_out_ssn_form_with_ssn_that_raises_exception - fill_in t('idv.form.ssn_label_html'), with: SSN_THAT_RAISES_EXCEPTION + fill_in t('idv.form.ssn_label'), with: SSN_THAT_RAISES_EXCEPTION end def fill_out_ssn_form_ok - fill_in t('idv.form.ssn_label_html'), with: GOOD_SSN + fill_in t('idv.form.ssn_label'), with: GOOD_SSN end def fill_out_ssn_form_fail - fill_in t('idv.form.ssn_label_html'), with: '' + fill_in t('idv.form.ssn_label'), with: '' end def click_doc_auth_back_link diff --git a/spec/support/features/idv_step_helper.rb b/spec/support/features/idv_step_helper.rb index ba5e74d22c5..e2028c50493 100644 --- a/spec/support/features/idv_step_helper.rb +++ b/spec/support/features/idv_step_helper.rb @@ -82,7 +82,7 @@ def click_sp_link end def sp_text - t('in_person_proofing.body.barcode.return_to_partner_html', link: link_text) + t('in_person_proofing.body.barcode.return_to_partner_html', link_html: link_text) end def complete_review_step(user = user_with_2fa) diff --git a/spec/views/idv/cancellations/new.html.erb_spec.rb b/spec/views/idv/cancellations/new.html.erb_spec.rb index 8e34e2b0ec2..6a4369bb2fd 100644 --- a/spec/views/idv/cancellations/new.html.erb_spec.rb +++ b/spec/views/idv/cancellations/new.html.erb_spec.rb @@ -65,7 +65,7 @@ 'idv.cancel.description.exit.with_sp_html', app_name: APP_NAME, sp_name: sp_name, - account_page_link: t('idv.cancel.description.account_page'), + account_page_link_html: t('idv.cancel.description.account_page'), ).each { |expected_p| expect(rendered).to have_content(expected_p) } expect(rendered).to have_button(t('idv.cancel.actions.exit', app_name: APP_NAME)) end diff --git a/spec/views/idv/please_call/show.html.erb_spec.rb b/spec/views/idv/please_call/show.html.erb_spec.rb index 55306635524..54630cfa079 100644 --- a/spec/views/idv/please_call/show.html.erb_spec.rb +++ b/spec/views/idv/please_call/show.html.erb_spec.rb @@ -17,7 +17,7 @@ expect(rendered).to have_text( strip_tags( t( - 'idv.failure.setup.fail_html', + 'idv.failure.setup.fail', support_code: 'ABCD', contact_number: '(844) 555-5555', ), diff --git a/spec/views/two_factor_authentication/otp_verification/show.html.erb_spec.rb b/spec/views/two_factor_authentication/otp_verification/show.html.erb_spec.rb index d60d7743d6a..1b0d8f24333 100644 --- a/spec/views/two_factor_authentication/otp_verification/show.html.erb_spec.rb +++ b/spec/views/two_factor_authentication/otp_verification/show.html.erb_spec.rb @@ -58,7 +58,7 @@ let(:help_text) do t( 'instructions.mfa.sms.number_message_html', - number: content_tag(:strong, presenter_data[:phone_number]), + number_html: content_tag(:strong, presenter_data[:phone_number]), expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES, ) end