diff --git a/app/assets/javascripts/i18n-strings.js.erb b/app/assets/javascripts/i18n-strings.js.erb index 503a5eed7e0..730ccde249d 100644 --- a/app/assets/javascripts/i18n-strings.js.erb +++ b/app/assets/javascripts/i18n-strings.js.erb @@ -1,8 +1,8 @@ window.LoginGov = window.LoginGov || {}; <% keys = [ - 'devise.two_factor_authentication.otp_delivery_preference.instruction', - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.instruction', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', 'errors.messages.format_mismatch', 'errors.messages.missing_field', 'forms.passwords.show', diff --git a/app/controllers/account_reset/cancel_controller.rb b/app/controllers/account_reset/cancel_controller.rb index 44f66f8cb90..b8daae456fe 100644 --- a/app/controllers/account_reset/cancel_controller.rb +++ b/app/controllers/account_reset/cancel_controller.rb @@ -14,7 +14,7 @@ def create def handle_success sign_out if current_user - flash[:success] = t('devise.two_factor_authentication.account_reset.successful_cancel') + flash[:success] = t('two_factor_authentication.account_reset.successful_cancel') end end end diff --git a/app/controllers/account_reset/report_fraud_controller.rb b/app/controllers/account_reset/report_fraud_controller.rb index f3763b29d18..913f7c9f7a3 100644 --- a/app/controllers/account_reset/report_fraud_controller.rb +++ b/app/controllers/account_reset/report_fraud_controller.rb @@ -14,7 +14,7 @@ def update def handle_success analytics.track_event(Analytics::ACCOUNT_RESET, event: :fraud, token_valid: true) sign_out if current_user - flash[:success] = t('devise.two_factor_authentication.account_reset.successful_cancel') + flash[:success] = t('two_factor_authentication.account_reset.successful_cancel') end def handle_failure diff --git a/app/controllers/concerns/two_factor_authenticatable.rb b/app/controllers/concerns/two_factor_authenticatable.rb index 82a1cd0994f..4b76fa8994e 100644 --- a/app/controllers/concerns/two_factor_authenticatable.rb +++ b/app/controllers/concerns/two_factor_authenticatable.rb @@ -87,11 +87,11 @@ def two_factor_authentication_method # Method will be renamed in the next refactor. # You can pass in any "type" with a corresponding I18n key in - # devise.two_factor_authentication.invalid_#{type} + # two_factor_authentication.invalid_#{type} def handle_invalid_otp(type: 'otp') update_invalid_user - flash.now[:error] = t("devise.two_factor_authentication.invalid_#{type}") + flash.now[:error] = t("two_factor_authentication.invalid_#{type}") if decorated_user.locked_out? handle_second_factor_locked_user(type) diff --git a/app/controllers/idv/otp_verification_controller.rb b/app/controllers/idv/otp_verification_controller.rb index 3ee9294bdb1..75707fcb9d7 100644 --- a/app/controllers/idv/otp_verification_controller.rb +++ b/app/controllers/idv/otp_verification_controller.rb @@ -52,7 +52,7 @@ def handle_otp_confirmation_failure if decorated_user.locked_out? handle_too_many_otp_attempts else - flash.now[:error] = t('devise.two_factor_authentication.invalid_otp') + flash.now[:error] = t('two_factor_authentication.invalid_otp') render :show end end diff --git a/app/controllers/two_factor_authentication/otp_verification_controller.rb b/app/controllers/two_factor_authentication/otp_verification_controller.rb index f955715df68..fdf19433ef8 100644 --- a/app/controllers/two_factor_authentication/otp_verification_controller.rb +++ b/app/controllers/two_factor_authentication/otp_verification_controller.rb @@ -47,7 +47,7 @@ def confirm_voice_capability return unless capabilities.sms_only? flash[:error] = t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: capabilities.unsupported_location ) redirect_to login_two_factor_url(otp_delivery_preference: 'sms', reauthn: reauthn?) diff --git a/app/javascript/app/phone-internationalization.js b/app/javascript/app/phone-internationalization.js index f7054dcbba8..a7458cbf066 100644 --- a/app/javascript/app/phone-internationalization.js +++ b/app/javascript/app/phone-internationalization.js @@ -10,7 +10,7 @@ const selectedInternationCodeOption = () => { const unsupportedInternationalPhoneOTPDeliveryWarningMessage = () => { const selectedOption = selectedInternationCodeOption(); if (selectedOption.dataset.smsOnly === 'true') { - const messageTemplate = I18n.t('devise.two_factor_authentication.otp_delivery_preference.phone_unsupported'); + const messageTemplate = I18n.t('two_factor_authentication.otp_delivery_preference.phone_unsupported'); return messageTemplate.replace('%{location}', selectedOption.dataset.countryName); } return null; @@ -27,7 +27,7 @@ const disablePhoneState = (phoneRadio, phoneLabel, smsRadio, deliveryMethodHint, const enablePhoneState = (phoneRadio, phoneLabel, deliveryMethodHint) => { phoneRadio.disabled = false; phoneLabel.classList.remove('btn-disabled'); - deliveryMethodHint.innerText = I18n.t('devise.two_factor_authentication.otp_delivery_preference.instruction'); + deliveryMethodHint.innerText = I18n.t('two_factor_authentication.otp_delivery_preference.instruction'); }; const updateOTPDeliveryMethods = () => { diff --git a/app/presenters/account_recovery_options_presenter.rb b/app/presenters/account_recovery_options_presenter.rb index 7c0f450f2aa..c006ae0ffc7 100644 --- a/app/presenters/account_recovery_options_presenter.rb +++ b/app/presenters/account_recovery_options_presenter.rb @@ -23,8 +23,8 @@ def options AVAILABLE_2FA_TYPES.map do |type| OpenStruct.new( type: type, - label: t("devise.two_factor_authentication.two_factor_choice_options.#{type}"), - info: t("devise.two_factor_authentication.two_factor_choice_options.#{type}_info"), + label: t("two_factor_authentication.two_factor_choice_options.#{type}"), + info: t("two_factor_authentication.two_factor_choice_options.#{type}_info"), selected: type == :sms ) end diff --git a/app/presenters/phone_setup_presenter.rb b/app/presenters/phone_setup_presenter.rb index f6b55f8db5b..a12b0dc00fc 100644 --- a/app/presenters/phone_setup_presenter.rb +++ b/app/presenters/phone_setup_presenter.rb @@ -12,11 +12,11 @@ def heading end def label - t("devise.two_factor_authentication.phone_#{otp_delivery_preference}_label") + t("two_factor_authentication.phone_#{otp_delivery_preference}_label") end def info - t("devise.two_factor_authentication.phone_#{otp_delivery_preference}_info_html") + t("two_factor_authentication.phone_#{otp_delivery_preference}_info_html") end def image 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 082527b1dd2..391fb956c69 100644 --- a/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb @@ -1,7 +1,7 @@ module TwoFactorAuthCode class AuthenticatorDeliveryPresenter < TwoFactorAuthCode::GenericDeliveryPresenter def header - t('devise.two_factor_authentication.totp_header_text') + t('two_factor_authentication.totp_header_text') end def help_text diff --git a/app/presenters/two_factor_auth_code/generic_delivery_presenter.rb b/app/presenters/two_factor_auth_code/generic_delivery_presenter.rb index 9d8a4d2be61..a567b781a9e 100644 --- a/app/presenters/two_factor_auth_code/generic_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/generic_delivery_presenter.rb @@ -46,7 +46,7 @@ def piv_cac_link return unless FeatureManagement.piv_cac_enabled? return unless has_piv_cac_configured view.link_to( - t('devise.two_factor_authentication.piv_cac_fallback.link'), + t('two_factor_authentication.piv_cac_fallback.link'), login_two_factor_piv_cac_path(locale: LinkLocaleResolver.locale) ) end @@ -55,7 +55,7 @@ def piv_cac_option return unless FeatureManagement.piv_cac_enabled? return unless has_piv_cac_configured t( - 'devise.two_factor_authentication.piv_cac_fallback.text_html', + 'two_factor_authentication.piv_cac_fallback.text_html', link: piv_cac_link ) end diff --git a/app/presenters/two_factor_auth_code/max_attempts_reached_presenter.rb b/app/presenters/two_factor_auth_code/max_attempts_reached_presenter.rb index e7e8b1cc46d..49643784720 100644 --- a/app/presenters/two_factor_auth_code/max_attempts_reached_presenter.rb +++ b/app/presenters/two_factor_auth_code/max_attempts_reached_presenter.rb @@ -7,7 +7,7 @@ class MaxAttemptsReachedPresenter < FailurePresenter COUNTDOWN_ID = 'countdown'.freeze - T_SCOPE = 'devise.two_factor_authentication'.freeze + T_SCOPE = 'two_factor_authentication'.freeze def initialize(type, decorated_user) super(:locked) 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 a1106863d9d..4e9f5a26d78 100644 --- a/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb +++ b/app/presenters/two_factor_auth_code/phone_delivery_presenter.rb @@ -5,7 +5,7 @@ class PhoneDeliveryPresenter < TwoFactorAuthCode::GenericDeliveryPresenter ) def header - t('devise.two_factor_authentication.header_text') + t('two_factor_authentication.header_text') end def phone_number_message 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 719781d08ba..f5069122b4a 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 @@ -4,7 +4,7 @@ class PivCacAuthenticationPresenter < TwoFactorAuthCode::GenericDeliveryPresente include ActionView::Helpers::TranslationHelper def header - t('devise.two_factor_authentication.piv_cac_header_text') + t('two_factor_authentication.piv_cac_header_text') end def help_text diff --git a/app/presenters/two_factor_login_options_presenter.rb b/app/presenters/two_factor_login_options_presenter.rb index b51fe6c18a3..9142387dd47 100644 --- a/app/presenters/two_factor_login_options_presenter.rb +++ b/app/presenters/two_factor_login_options_presenter.rb @@ -58,17 +58,17 @@ def account_reset_or_cancel_link private def account_reset_link - t('devise.two_factor_authentication.account_reset.text_html', + t('two_factor_authentication.account_reset.text_html', link: @view.link_to( - t('devise.two_factor_authentication.account_reset.link'), + t('two_factor_authentication.account_reset.link'), account_reset_request_path(locale: LinkLocaleResolver.locale) )) end def account_reset_cancel_link - t('devise.two_factor_authentication.account_reset.pending_html', + t('two_factor_authentication.account_reset.pending_html', cancel_link: @view.link_to( - t('devise.two_factor_authentication.account_reset.cancel_link'), + t('two_factor_authentication.account_reset.cancel_link'), account_reset_cancel_url(token: account_reset_token) )) end diff --git a/app/presenters/two_factor_options_presenter.rb b/app/presenters/two_factor_options_presenter.rb index ba2ae1ce146..ece7443f26e 100644 --- a/app/presenters/two_factor_options_presenter.rb +++ b/app/presenters/two_factor_options_presenter.rb @@ -13,11 +13,11 @@ def title end def heading - t('devise.two_factor_authentication.two_factor_choice') + t('two_factor_authentication.two_factor_choice') end def info - t('devise.two_factor_authentication.two_factor_choice_intro') + t('two_factor_authentication.two_factor_choice_intro') end def label @@ -28,8 +28,8 @@ def options available_2fa_types.map do |type| OpenStruct.new( type: type, - label: t("devise.two_factor_authentication.two_factor_choice_options.#{type}"), - info: t("devise.two_factor_authentication.two_factor_choice_options.#{type}_info"), + label: t("two_factor_authentication.two_factor_choice_options.#{type}"), + info: t("two_factor_authentication.two_factor_choice_options.#{type}_info"), selected: type == :sms ) end diff --git a/app/validators/otp_delivery_preference_validator.rb b/app/validators/otp_delivery_preference_validator.rb index 42a22dc404f..be310e9437d 100644 --- a/app/validators/otp_delivery_preference_validator.rb +++ b/app/validators/otp_delivery_preference_validator.rb @@ -16,7 +16,7 @@ def otp_delivery_preference_supported errors.add( :phone, I18n.t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: phone_number_capabilities.unsupported_location ) ) diff --git a/app/views/idv/otp_delivery_method/new.html.slim b/app/views/idv/otp_delivery_method/new.html.slim index 92eac66e68c..c5bd78c5ce8 100644 --- a/app/views/idv/otp_delivery_method/new.html.slim +++ b/app/views/idv/otp_delivery_method/new.html.slim @@ -10,9 +10,9 @@ p.mt1 = t('idv.messages.otp_delivery_method.phone_number_html', class: :otp_delivery_preference_sms span.indicator.mt-tiny span.blue.bold.fs-20p - = t('devise.two_factor_authentication.otp_delivery_preference.sms') + = t('two_factor_authentication.otp_delivery_preference.sms') .regular.gray-dark.fs-10p.mb-tiny - = t('devise.two_factor_authentication.two_factor_choice_options.sms_info') + = t('two_factor_authentication.two_factor_choice_options.sms_info') label.btn-border.col-12.mb0 .radio = radio_button_tag 'otp_delivery_selection_form[otp_delivery_preference]', @@ -20,9 +20,9 @@ p.mt1 = t('idv.messages.otp_delivery_method.phone_number_html', class: :otp_delivery_preference_voice span.indicator.mt-tiny span.blue.bold.fs-20p - = t('devise.two_factor_authentication.otp_delivery_preference.voice') + = t('two_factor_authentication.otp_delivery_preference.voice') .regular.gray-dark.fs-10p.mb-tiny - = t('devise.two_factor_authentication.two_factor_choice_options.voice_info') + = t('two_factor_authentication.two_factor_choice_options.voice_info') - if FeatureManagement.enable_usps_verification? .mt3 = t('idv.form.no_alternate_phone_html', diff --git a/app/views/idv/otp_verification/show.html.slim b/app/views/idv/otp_verification/show.html.slim index 997a4007232..17c3e273c61 100644 --- a/app/views/idv/otp_verification/show.html.slim +++ b/app/views/idv/otp_verification/show.html.slim @@ -1,6 +1,6 @@ - title t('titles.enter_2fa_code') -h1.h3.my0 = t('devise.two_factor_authentication.header_text') +h1.h3.my0 = t('two_factor_authentication.header_text') p == @presenter.phone_number_message diff --git a/app/views/two_factor_authentication/personal_key_verification/show.html.slim b/app/views/two_factor_authentication/personal_key_verification/show.html.slim index 7c372eacd9d..0957ac88e44 100644 --- a/app/views/two_factor_authentication/personal_key_verification/show.html.slim +++ b/app/views/two_factor_authentication/personal_key_verification/show.html.slim @@ -1,7 +1,7 @@ - title t('titles.enter_2fa_code') -h1.h3.my0 = t('devise.two_factor_authentication.personal_key_header_text') -p.mt-tiny.mb0 = t('devise.two_factor_authentication.personal_key_prompt') +h1.h3.my0 = t('two_factor_authentication.personal_key_header_text') +p.mt-tiny.mb0 = t('two_factor_authentication.personal_key_prompt') = simple_form_for(@personal_key_form, url: login_two_factor_personal_key_path, html: { autocomplete: 'off', method: :post, role: 'form' }) do |f| diff --git a/app/views/two_factor_authentication/webauthn_verification/show.html.slim b/app/views/two_factor_authentication/webauthn_verification/show.html.slim index 17e7ce368b3..f86e3ccc92c 100644 --- a/app/views/two_factor_authentication/webauthn_verification/show.html.slim +++ b/app/views/two_factor_authentication/webauthn_verification/show.html.slim @@ -1,6 +1,6 @@ - title t('titles.present_webauthn') -h1.h3.my0 = t('devise.two_factor_authentication.webauthn_header_text') +h1.h3.my0 = t('two_factor_authentication.webauthn_header_text') .no-spinner p.mt-tiny.mb3 = t('instructions.mfa.webauthn.confirm_webauthn_html') diff --git a/app/views/users/shared/_otp_delivery_preference_selection.html.slim b/app/views/users/shared/_otp_delivery_preference_selection.html.slim index ca75710a428..5f2da83e73e 100644 --- a/app/views/users/shared/_otp_delivery_preference_selection.html.slim +++ b/app/views/users/shared/_otp_delivery_preference_selection.html.slim @@ -1,19 +1,19 @@ .mb3 fieldset.m0.p0.border-none - legend.mb1.h4.serif.bold = t('devise.two_factor_authentication.otp_delivery_preference.title') + legend.mb1.h4.serif.bold = t('two_factor_authentication.otp_delivery_preference.title') p#otp_delivery_preference_instruction.mt0.mb2 - = t('devise.two_factor_authentication.otp_delivery_preference.instruction') + = t('two_factor_authentication.otp_delivery_preference.instruction') label.btn-border.col-12.sm-col-5.sm-mr2.mb2.sm-mb0 .radio = radio_button_tag 'user_phone_form[otp_delivery_preference]', :sms, true, class: :otp_delivery_preference_sms span.indicator - = t('devise.two_factor_authentication.otp_delivery_preference.sms') + = t('two_factor_authentication.otp_delivery_preference.sms') label.btn-border.col-12.sm-col-5.mb0 .radio = radio_button_tag 'user_phone_form[otp_delivery_preference]', :voice, false, class: :otp_delivery_preference_voice span.indicator - = t('devise.two_factor_authentication.otp_delivery_preference.voice') + = t('two_factor_authentication.otp_delivery_preference.voice') p.mb0.mt1 = link_to t('links.two_factor_authentication.app_option'), authenticator_setup_path diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 0f56c8f2fa3..39925884b5d 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -96,21 +96,21 @@ ignore_unused: - 'devise.mailer.confirmation_instructions.subject' - 'devise.mailer.reset_password_instructions.subject' - 'devise.sessions.signed_in' - - 'devise.two_factor_authentication.invalid_otp' - - 'devise.two_factor_authentication.invalid_personal_key' - - 'devise.two_factor_authentication.invalid_piv_cac' - - 'devise.two_factor_authentication.max_generic_login_attempts_reached' - - 'devise.two_factor_authentication.max_otp_login_attempts_reached' - - 'devise.two_factor_authentication.max_otp_requests_reached' - - 'devise.two_factor_authentication.max_personal_key_login_attempts_reached' - - 'devise.two_factor_authentication.max_piv_cac_login_attempts_reached' - - 'devise.two_factor_authentication.phone_sms_info_html' - - 'devise.two_factor_authentication.phone_sms_label' - - 'devise.two_factor_authentication.phone_voice_info_html' - - 'devise.two_factor_authentication.phone_voice_label' - - 'devise.two_factor_authentication.please_try_again_html' - - 'devise.two_factor_authentication.read_about_two_factor_authentication.link' - - 'devise.two_factor_authentication.read_about_two_factor_authentication.text_html' + - 'two_factor_authentication.invalid_otp' + - 'two_factor_authentication.invalid_personal_key' + - 'two_factor_authentication.invalid_piv_cac' + - 'two_factor_authentication.max_generic_login_attempts_reached' + - 'two_factor_authentication.max_otp_login_attempts_reached' + - 'two_factor_authentication.max_otp_requests_reached' + - 'two_factor_authentication.max_personal_key_login_attempts_reached' + - 'two_factor_authentication.max_piv_cac_login_attempts_reached' + - 'two_factor_authentication.phone_sms_info_html' + - 'two_factor_authentication.phone_sms_label' + - 'two_factor_authentication.phone_voice_info_html' + - 'two_factor_authentication.phone_voice_label' + - 'two_factor_authentication.please_try_again_html' + - 'two_factor_authentication.read_about_two_factor_authentication.link' + - 'two_factor_authentication.read_about_two_factor_authentication.text_html' - 'errors.messages.*' - 'forms.piv_cac_setup.*' - 'headings.piv_cac_setup.*' diff --git a/config/locales/devise/en.yml b/config/locales/devise/en.yml index 4572a64847d..c58594198d7 100644 --- a/config/locales/devise/en.yml +++ b/config/locales/devise/en.yml @@ -69,73 +69,3 @@ en: sessions: signed_in: '' signed_out: You are now signed out. - two_factor_authentication: - 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} - successful_cancel: Thank you. Your request to delete your login.gov account - has been cancelled. - text_html: If you can't use any of these security options above, you can reset - your preferences by %{link}. - header_text: Enter your security code - invalid_otp: That security code is invalid. You can try entering it again or - request a new one-time security code. - invalid_personal_key: That personal key is invalid. - invalid_piv_cac: That PIV/CAC is incorrect. - max_generic_login_attempts_reached: For your security, your account is temporarily - locked. - max_otp_login_attempts_reached: For your security, your account is temporarily - locked because you have entered the one-time security code incorrectly too - many times. - max_otp_requests_reached: For your security, your account is temporarily locked - because you have requested a security code too many times. - max_personal_key_login_attempts_reached: For your security, your account is - temporarily locked because you have entered the personal key incorrectly too - many times. - max_piv_cac_login_attempts_reached: For your security, your account is temporarily - locked because you have presented your piv/cac credential incorrectly too - many times. - otp_delivery_preference: - instruction: You can change this selection the next time you log in. If you - entered a landline, please select "Phone call" below. - phone_unsupported: We're unable to make phone calls to people in %{location} - at this time. - sms: Text message (SMS) - title: How should we send you a code? - voice: Phone call - personal_key_header_text: Enter your personal key - personal_key_prompt: You can use this personal key once. After you enter it, - you'll be provided a new key. - phone_sms_info_html: We'll text a security code each time you sign in. - phone_sms_label: Mobile phone number - phone_voice_info_html: We'll call you with a security code each time - you sign in. - phone_voice_label: Phone number - piv_cac_fallback: - link: Use your PIV/CAC instead - text_html: Do you have your PIV/CAC? %{link} - piv_cac_header_text: Present your PIV/CAC - please_try_again_html: Please try again in %{time_remaining}. - read_about_two_factor_authentication: - link: read about two-factor authentication - text_html: You can %{link} and why we use it at our Help page. - totp_header_text: Enter your authentication app code - two_factor_choice: Secure your account - two_factor_choice_intro: login.gov makes sure you can access your account by - adding a second layer of security. - two_factor_choice_options: - auth_app: Authentication application - auth_app_info: Set up an authentication application to get your security code - without providing a phone number - piv_cac: Government employees - piv_cac_info: Use your PIV/CAC card to secure your account - sms: Text message / SMS - sms_info: Get your security code via text message / SMS - voice: Phone call - voice_info: Get your security code via phone call - webauthn: Hardware security key - webauthn_info: Use a hardware security key to secure your account - webauthn_header_text: Present your hardware security key diff --git a/config/locales/devise/es.yml b/config/locales/devise/es.yml index b056d7143c6..07348c31d70 100644 --- a/config/locales/devise/es.yml +++ b/config/locales/devise/es.yml @@ -71,70 +71,3 @@ es: sessions: signed_in: '' signed_out: Su sesión ha terminado ahora. - two_factor_authentication: - 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} - successful_cancel: Gracias. Su solicitud para eliminar su cuenta de login.gov - ha sido cancelada. - text_html: Si no puede usar ninguna de estas opciones de seguridad anteriores, - puede restablecer tus preferencias por %{link}. - header_text: Ingrese su código de seguridad - invalid_otp: Ese código de seguridad no es válido. Puede intentar ingresarlo - de nuevo o solicitar un nuevo código de seguridad de sólo un uso. - invalid_personal_key: Esa clave personal no es válida. - invalid_piv_cac: NOT TRANSLATED YET - max_generic_login_attempts_reached: Para su seguridad, su cuenta está bloqueada - temporalmente. - max_otp_login_attempts_reached: Para su seguridad, su cuenta ha sido bloqueada - temporalmente porque ha ingresado incorrectamente el código de seguridad de - sólo un uso demasiadas veces. - max_otp_requests_reached: Para su seguridad, su cuenta ha sido bloqueada temporalmente - porque ha solicitado un código de seguridad demasiadas veces más de lo permitido. - max_personal_key_login_attempts_reached: Para su seguridad, su cuenta ha sido - bloqueada temporalmente porque ha ingresado incorrectamente la clave personal - demasiadas veces. - max_piv_cac_login_attempts_reached: NOT TRANSLATED YET - otp_delivery_preference: - instruction: Puede cambiar esta selección la próxima vez que inicie sesión. - phone_unsupported: NOT TRANSLATED YET - sms: Mensaje de texto (SMS, sigla en inglés) - title: "¿Cómo deberíamos enviarle un código?" - voice: Llamada telefónica - personal_key_header_text: Ingrese su clave personal - personal_key_prompt: Puede usar esta clave personal una vez. Después de ingresarlo, - se le dará una nueva clave. - phone_sms_info_html: Le enviaremos un mensaje de texto con un código de seguridad - cada vez que inicie sesión. - phone_sms_label: Número de teléfono móvil - phone_voice_info_html: Te llamaremos con un código de seguridad cada - vez que inicies sesión. - phone_voice_label: Número de teléfono - piv_cac_fallback: - link: Use su PIV/CAC en su lugar - text_html: "¿Tiene usted PIV/CAC? %{link}" - piv_cac_header_text: NOT TRANSLATED YET - please_try_again_html: Inténtelo de nuevo en %{time_remaining}. - read_about_two_factor_authentication: - link: leer acerca de la autenticación de dos factores - text_html: Puede %{link} y por qué la utilizamos en nuestra página de Ayuda. - totp_header_text: Ingrese su código de la app de autenticación - two_factor_choice: Asegure su cuenta - two_factor_choice_intro: login.gov se asegura de que pueda acceder a su cuenta - agregando una segunda capa de seguridad. - two_factor_choice_options: - auth_app: Aplicación de autenticación - auth_app_info: Configure una aplicación de autenticación para obtener su código - de seguridad sin proporcionar un número de teléfono - piv_cac: Empleados del Gobierno - piv_cac_info: Use su tarjeta PIV / CAC para asegurar su cuenta - sms: Mensaje de texto / SMS - sms_info: Obtenga su código de seguridad a través de mensajes de texto / SMS - voice: Llamada telefónica - voice_info: Obtenga su código de seguridad a través de una llamada telefónica - webauthn: Clave de seguridad de hardware - webauthn_info: Use una clave de seguridad de hardware para proteger su cuenta - webauthn_header_text: Presente su clave de seguridad de hardware diff --git a/config/locales/devise/fr.yml b/config/locales/devise/fr.yml index 78d06113cb9..c67096c17f5 100644 --- a/config/locales/devise/fr.yml +++ b/config/locales/devise/fr.yml @@ -77,74 +77,3 @@ fr: sessions: signed_in: '' signed_out: Vous êtes maintenant déconnecté(e). - two_factor_authentication: - account_reset: - cancel_link: Annuler votre demande - link: supprimer votre compte - pending_html: 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 login.gov 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}. - header_text: Entrez votre code de sécurité - invalid_otp: Ce code de sécurité est non valide. Vous pouvez essayer de l'entrer - de nouveau ou demander un nouveau code de sécurité à utilisation unique. - invalid_personal_key: Cette clé personnelle est non valide. - invalid_piv_cac: NOT TRANSLATED YET - max_generic_login_attempts_reached: Pour votre sécurité, votre compte est temporairement - verrouillé. - max_otp_login_attempts_reached: Pour votre sécurité, votre compte est temporairement - verrouillé, car vous avez entré le code de sécurité à utilisation unique de - façon erronée à de trop nombreuses reprises. - max_otp_requests_reached: Pour votre sécurité, votre compte est temporairement - verrouillé car vous avez demandé un code de sécurité à trop de reprises. - max_personal_key_login_attempts_reached: Pour votre sécurité, votre compte est - temporairement verrouillé, car vous avez entré le code de sécurité à utilisation - unique de façon erronée à de trop nombreuses reprises. - max_piv_cac_login_attempts_reached: NOT TRANSLATED YET - otp_delivery_preference: - instruction: Vous pouvez changer cette sélection la prochaine fois que vous - vous connectez. - phone_unsupported: NOT TRANSLATED YET - sms: Message texte (SMS) - title: Comment devrions-nous vous envoyer un code? - voice: Appel téléphonique - personal_key_header_text: Entrez votre clé personnelle - personal_key_prompt: Vous pouvez utiliser cette clé personnelle une fois seulement. - Une fois que vous l'entrez, vous recevrez une nouvelle clé. - phone_sms_info_html: Nous vous enverrons un code de sécurité chaque - fois que vous vous connectez. - phone_sms_label: Numéro de téléphone portable - phone_voice_info_html: Nous vous appellerons avec un code de sécurité chaque - fois que vous vous connectez. - phone_voice_label: Numéro de téléphone - piv_cac_fallback: - link: Utilisez plutôt votre PIV/CAC - text_html: Avez-vous votre PIV/CAC? %{link} - piv_cac_header_text: NOT TRANSLATED YET - please_try_again_html: Veuillez essayer de nouveau dans %{time_remaining}. - read_about_two_factor_authentication: - link: lire sur l'authentification à deux facteurs - text_html: Vous pouvez %{link} et pourquoi nous l'utilisons sur notre page - d'aide. - totp_header_text: Entrez votre code d'application d'authentification - two_factor_choice: Sécurise ton compte - two_factor_choice_intro: login.gov s'assure que vous pouvez accéder à votre - compte en ajoutant une deuxième couche de sécurité. - two_factor_choice_options: - auth_app: Application d'authentification - auth_app_info: Configurez une application d'authentification pour obtenir - votre code de sécurité sans fournir de numéro de téléphone - piv_cac: Employés du gouvernement - piv_cac_info: Utilisez votre carte PIV / CAC pour sécuriser votre compte - sms: SMS - sms_info: Obtenez votre code de sécurité par SMS - voice: Appel téléphonique - voice_info: Obtenez votre code de sécurité par appel téléphonique - webauthn: Clé de sécurité physique - webauthn_info: Utilisez une clé de sécurité physique pour sécuriser votre - compte - webauthn_header_text: Présentez votre clé de sécurité physique diff --git a/config/locales/two_factor_authentication/en.yml b/config/locales/two_factor_authentication/en.yml index 0c92302b86f..4ca48b83280 100644 --- a/config/locales/two_factor_authentication/en.yml +++ b/config/locales/two_factor_authentication/en.yml @@ -1,7 +1,22 @@ --- en: two_factor_authentication: + 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} + successful_cancel: Thank you. Your request to delete your login.gov account + has been cancelled. + text_html: If you can't use any of these security options above, you can reset + your preferences by %{link}. choose_another_option: "‹ Choose another option" + header_text: Enter your security code + invalid_otp: That security code is invalid. You can try entering it again or request + a new one-time security code. + invalid_personal_key: That personal key is invalid. + invalid_piv_cac: That PIV/CAC is incorrect. login_intro: You set these up when you created your account login_options: auth_app: Authentication app @@ -19,13 +34,65 @@ en: webauthn_info: Use your hardware security key instead of a security code. login_options_link_text: Choose another security option login_options_title: Select your security option + max_generic_login_attempts_reached: For your security, your account is temporarily + locked. + max_otp_login_attempts_reached: For your security, your account is temporarily + locked because you have entered the one-time security code incorrectly too many + times. + max_otp_requests_reached: For your security, your account is temporarily locked + because you have requested a security code too many times. + max_personal_key_login_attempts_reached: For your security, your account is temporarily + locked because you have entered the personal key incorrectly too many times. + max_piv_cac_login_attempts_reached: For your security, your account is temporarily + locked because you have presented your piv/cac credential incorrectly too many + times. + otp_delivery_preference: + instruction: You can change this selection the next time you log in. If you + entered a landline, please select "Phone call" below. + phone_unsupported: We're unable to make phone calls to people in %{location} + at this time. + sms: Text message (SMS) + title: How should we send you a code? + voice: Phone call personal_key_fallback: question: Don't have your personal key? + personal_key_header_text: Enter your personal key + personal_key_prompt: You can use this personal key once. After you enter it, you'll + be provided a new key. phone_fallback: question: Don't have access to your phone right now? + phone_sms_info_html: We'll text a security code each time you sign in. + phone_sms_label: Mobile phone number + phone_voice_info_html: We'll call you with a security code each time you + sign in. + phone_voice_label: Phone number piv_cac_fallback: + link: Use your PIV/CAC instead + text_html: Do you have your PIV/CAC? %{link} question: Don't have your piv/cac card available? + piv_cac_header_text: Present your PIV/CAC + please_try_again_html: Please try again in %{time_remaining}. + read_about_two_factor_authentication: + link: read about two-factor authentication + text_html: You can %{link} and why we use it at our Help page. totp_fallback: question: Don't have your authenticator app? + totp_header_text: Enter your authentication app code + two_factor_choice: Secure your account + two_factor_choice_intro: login.gov makes sure you can access your account by adding + a second layer of security. + two_factor_choice_options: + auth_app: Authentication application + auth_app_info: Set up an authentication application to get your security code + without providing a phone number + piv_cac: Government employees + piv_cac_info: Use your PIV/CAC card to secure your account + sms: Text message / SMS + sms_info: Get your security code via text message / SMS + voice: Phone call + voice_info: Get your security code via phone call + webauthn: Hardware security key + webauthn_info: Use a hardware security key to secure your account webauthn_fallback: question: Don't have your hardware security key available? + webauthn_header_text: Present your hardware security key diff --git a/config/locales/two_factor_authentication/es.yml b/config/locales/two_factor_authentication/es.yml index c7d74c8eabb..f4c28782df1 100644 --- a/config/locales/two_factor_authentication/es.yml +++ b/config/locales/two_factor_authentication/es.yml @@ -1,7 +1,22 @@ --- es: two_factor_authentication: + 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} + successful_cancel: Gracias. Su solicitud para eliminar su cuenta de login.gov + ha sido cancelada. + text_html: Si no puede usar ninguna de estas opciones de seguridad anteriores, + puede restablecer tus preferencias por %{link}. choose_another_option: "‹ Elige otra opción" + header_text: Ingrese su código de seguridad + invalid_otp: Ese código de seguridad no es válido. Puede intentar ingresarlo de + nuevo o solicitar un nuevo código de seguridad de sólo un uso. + invalid_personal_key: Esa clave personal no es válida. + invalid_piv_cac: NOT TRANSLATED YET login_intro: Usted configuró esto cuando creó su cuenta login_options: auth_app: Aplicación de autenticación @@ -22,13 +37,63 @@ es: seguridad. login_options_link_text: Elige otra opción de seguridad login_options_title: Seleccione su opción de seguridad + max_generic_login_attempts_reached: Para su seguridad, su cuenta está bloqueada + temporalmente. + max_otp_login_attempts_reached: Para su seguridad, su cuenta ha sido bloqueada + temporalmente porque ha ingresado incorrectamente el código de seguridad de + sólo un uso demasiadas veces. + max_otp_requests_reached: Para su seguridad, su cuenta ha sido bloqueada temporalmente + porque ha solicitado un código de seguridad demasiadas veces más de lo permitido. + max_personal_key_login_attempts_reached: Para su seguridad, su cuenta ha sido + bloqueada temporalmente porque ha ingresado incorrectamente la clave personal + demasiadas veces. + max_piv_cac_login_attempts_reached: NOT TRANSLATED YET + otp_delivery_preference: + instruction: Puede cambiar esta selección la próxima vez que inicie sesión. + phone_unsupported: NOT TRANSLATED YET + sms: Mensaje de texto (SMS, sigla en inglés) + title: "¿Cómo deberíamos enviarle un código?" + voice: Llamada telefónica personal_key_fallback: question: "¿No tiene su clave personal?" + personal_key_header_text: Ingrese su clave personal + personal_key_prompt: Puede usar esta clave personal una vez. Después de ingresarlo, + se le dará una nueva clave. phone_fallback: question: "¿No tiene acceso a su teléfono ahora mismo?" + phone_sms_info_html: Le enviaremos un mensaje de texto con un código de seguridad + cada vez que inicie sesión. + phone_sms_label: Número de teléfono móvil + phone_voice_info_html: Te llamaremos con un código de seguridad cada vez + que inicies sesión. + phone_voice_label: Número de teléfono piv_cac_fallback: + link: Use su PIV/CAC en su lugar + text_html: "¿Tiene usted PIV/CAC? %{link}" question: "¿No tiene su tarjeta PIV/CAC disponible?" + piv_cac_header_text: NOT TRANSLATED YET + please_try_again_html: Inténtelo de nuevo en %{time_remaining}. + read_about_two_factor_authentication: + link: leer acerca de la autenticación de dos factores + text_html: Puede %{link} y por qué la utilizamos en nuestra página de Ayuda. totp_fallback: question: "¿No tiene su aplicación de autenticación?" + totp_header_text: Ingrese su código de la app de autenticación + two_factor_choice: Asegure su cuenta + two_factor_choice_intro: login.gov se asegura de que pueda acceder a su cuenta + agregando una segunda capa de seguridad. + two_factor_choice_options: + auth_app: Aplicación de autenticación + auth_app_info: Configure una aplicación de autenticación para obtener su código + de seguridad sin proporcionar un número de teléfono + piv_cac: Empleados del Gobierno + piv_cac_info: Use su tarjeta PIV / CAC para asegurar su cuenta + sms: Mensaje de texto / SMS + sms_info: Obtenga su código de seguridad a través de mensajes de texto / SMS + voice: Llamada telefónica + voice_info: Obtenga su código de seguridad a través de una llamada telefónica + webauthn: Clave de seguridad de hardware + webauthn_info: Use una clave de seguridad de hardware para proteger su cuenta webauthn_fallback: question: "¿No tienes tu clave de seguridad de hardware disponible?" + webauthn_header_text: Presente su clave de seguridad de hardware diff --git a/config/locales/two_factor_authentication/fr.yml b/config/locales/two_factor_authentication/fr.yml index 1750fa22d5b..4795fa7aaac 100644 --- a/config/locales/two_factor_authentication/fr.yml +++ b/config/locales/two_factor_authentication/fr.yml @@ -1,7 +1,22 @@ --- fr: two_factor_authentication: + account_reset: + cancel_link: Annuler votre demande + link: supprimer votre compte + pending_html: 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 + login.gov 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}. choose_another_option: "‹ Choisissez une autre option" + header_text: Entrez votre code de sécurité + invalid_otp: Ce code de sécurité est non valide. Vous pouvez essayer de l'entrer + de nouveau ou demander un nouveau code de sécurité à utilisation unique. + invalid_personal_key: Cette clé personnelle est non valide. + invalid_piv_cac: NOT TRANSLATED YET login_intro: Vous les avez configurés lorsque vous avez crée votre compte login_options: auth_app: Application d'authentification @@ -22,13 +37,64 @@ fr: sécurité. login_options_link_text: Choisissez une autre option de sécurité login_options_title: Sélectionnez votre option de sécurité + max_generic_login_attempts_reached: Pour votre sécurité, votre compte est temporairement + verrouillé. + max_otp_login_attempts_reached: Pour votre sécurité, votre compte est temporairement + verrouillé, car vous avez entré le code de sécurité à utilisation unique de + façon erronée à de trop nombreuses reprises. + max_otp_requests_reached: Pour votre sécurité, votre compte est temporairement + verrouillé car vous avez demandé un code de sécurité à trop de reprises. + max_personal_key_login_attempts_reached: Pour votre sécurité, votre compte est + temporairement verrouillé, car vous avez entré le code de sécurité à utilisation + unique de façon erronée à de trop nombreuses reprises. + max_piv_cac_login_attempts_reached: NOT TRANSLATED YET + otp_delivery_preference: + instruction: Vous pouvez changer cette sélection la prochaine fois que vous + vous connectez. + phone_unsupported: NOT TRANSLATED YET + sms: Message texte (SMS) + title: Comment devrions-nous vous envoyer un code? + voice: Appel téléphonique personal_key_fallback: question: Vous n'avez pas votre clé personnelle? + personal_key_header_text: Entrez votre clé personnelle + personal_key_prompt: Vous pouvez utiliser cette clé personnelle une fois seulement. + Une fois que vous l'entrez, vous recevrez une nouvelle clé. phone_fallback: question: Vous n'avez pas accès à votre téléphone maintenant? + phone_sms_info_html: Nous vous enverrons un code de sécurité chaque fois + que vous vous connectez. + phone_sms_label: Numéro de téléphone portable + phone_voice_info_html: Nous vous appellerons avec un code de sécurité chaque + fois que vous vous connectez. + phone_voice_label: Numéro de téléphone piv_cac_fallback: + link: Utilisez plutôt votre PIV/CAC + text_html: Avez-vous votre PIV/CAC? %{link} question: Vous n'avez pas accès à votre carte PIV/CAC? + piv_cac_header_text: NOT TRANSLATED YET + please_try_again_html: Veuillez essayer de nouveau dans %{time_remaining}. + read_about_two_factor_authentication: + link: lire sur l'authentification à deux facteurs + text_html: Vous pouvez %{link} et pourquoi nous l'utilisons sur notre page d'aide. totp_fallback: question: Vous n'avez pas votre application d'authentification? + totp_header_text: Entrez votre code d'application d'authentification + two_factor_choice: Sécurise ton compte + two_factor_choice_intro: login.gov s'assure que vous pouvez accéder à votre compte + en ajoutant une deuxième couche de sécurité. + two_factor_choice_options: + auth_app: Application d'authentification + auth_app_info: Configurez une application d'authentification pour obtenir votre + code de sécurité sans fournir de numéro de téléphone + piv_cac: Employés du gouvernement + piv_cac_info: Utilisez votre carte PIV / CAC pour sécuriser votre compte + sms: SMS + sms_info: Obtenez votre code de sécurité par SMS + voice: Appel téléphonique + voice_info: Obtenez votre code de sécurité par appel téléphonique + webauthn: Clé de sécurité physique + webauthn_info: Utilisez une clé de sécurité physique pour sécuriser votre compte webauthn_fallback: question: Votre clé de sécurité physique n'est pas disponible? + webauthn_header_text: Présentez votre clé de sécurité physique diff --git a/spec/controllers/account_reset/cancel_controller_spec.rb b/spec/controllers/account_reset/cancel_controller_spec.rb index a3b2a5c3777..ac3209d0d6a 100644 --- a/spec/controllers/account_reset/cancel_controller_spec.rb +++ b/spec/controllers/account_reset/cancel_controller_spec.rb @@ -67,7 +67,7 @@ post :create, params: { token: token } expect(flash[:success]). - to eq t('devise.two_factor_authentication.account_reset.successful_cancel') + to eq t('two_factor_authentication.account_reset.successful_cancel') expect(response).to redirect_to root_url end diff --git a/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb index da6606f3cb7..79a42438ab1 100644 --- a/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb +++ b/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb @@ -100,7 +100,7 @@ end it 'displays flash error message' do - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_otp') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_otp') end end @@ -333,7 +333,7 @@ end it 'displays error flash notice' do - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_otp') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_otp') end it 'tracks an event' do diff --git a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb index 84ee076916e..f011714cde1 100644 --- a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb +++ b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb @@ -94,7 +94,7 @@ post :create, params: payload expect(response).to render_template(:show) - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_personal_key') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_personal_key') end end @@ -120,7 +120,7 @@ post :create, params: payload expect(response).to render_template(:show) - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_personal_key') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_personal_key') end it 'tracks the max attempts event' do diff --git a/spec/controllers/two_factor_authentication/piv_cac_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/piv_cac_verification_controller_spec.rb index 3f7dbc95674..966a6e5cfbd 100644 --- a/spec/controllers/two_factor_authentication/piv_cac_verification_controller_spec.rb +++ b/spec/controllers/two_factor_authentication/piv_cac_verification_controller_spec.rb @@ -107,7 +107,7 @@ end it 'displays flash error message' do - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_piv_cac') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_piv_cac') end it 'resets the piv/cac session information' do @@ -131,7 +131,7 @@ end it 'displays flash error message' do - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_piv_cac') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_piv_cac') end it 'resets the piv/cac session information' do diff --git a/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb index 519dba532ac..d1323bd6558 100644 --- a/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb +++ b/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb @@ -59,7 +59,7 @@ end it 'displays flash error message' do - expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_otp') + expect(flash[:error]).to eq t('two_factor_authentication.invalid_otp') end end diff --git a/spec/features/account_reset/cancel_request_spec.rb b/spec/features/account_reset/cancel_request_spec.rb index d2524fac848..c587970af65 100644 --- a/spec/features/account_reset/cancel_request_spec.rb +++ b/spec/features/account_reset/cancel_request_spec.rb @@ -7,14 +7,14 @@ user = create(:user, :signed_up) signin(user.email, user.password) click_link t('two_factor_authentication.login_options_link_text') - click_link t('devise.two_factor_authentication.account_reset.link') + click_link t('two_factor_authentication.account_reset.link') click_button t('account_reset.request.yes_continue') open_last_email click_email_link_matching(/cancel\?token/) expect(page).to have_current_path new_user_session_path expect(page). - to have_content t('devise.two_factor_authentication.account_reset.successful_cancel') + to have_content t('two_factor_authentication.account_reset.successful_cancel') signin(user.email, user.password) @@ -29,7 +29,7 @@ user = create(:user, :signed_up) signin(user.email, user.password) click_link t('two_factor_authentication.login_options_link_text') - click_link t('devise.two_factor_authentication.account_reset.link') + click_link t('two_factor_authentication.account_reset.link') click_button t('account_reset.request.yes_continue') reset_email @@ -40,7 +40,7 @@ expect(page).to have_current_path new_user_session_path expect(page). - to have_content t('devise.two_factor_authentication.account_reset.successful_cancel') + to have_content t('two_factor_authentication.account_reset.successful_cancel') signin(user.email, user.password) diff --git a/spec/features/account_reset/delete_account_spec.rb b/spec/features/account_reset/delete_account_spec.rb index 6d260c2c291..5b435de013b 100644 --- a/spec/features/account_reset/delete_account_spec.rb +++ b/spec/features/account_reset/delete_account_spec.rb @@ -11,7 +11,7 @@ it 'allows the user to delete their account after 24 hours' do signin(user.email, user.password) click_link t('two_factor_authentication.login_options_link_text') - click_link t('devise.two_factor_authentication.account_reset.link') + click_link t('two_factor_authentication.account_reset.link') click_button t('account_reset.request.yes_continue') expect(page). @@ -58,7 +58,7 @@ user = create(:user, :with_authentication_app) signin(user.email, user.password) click_link t('two_factor_authentication.login_options_link_text') - click_link t('devise.two_factor_authentication.account_reset.link') + click_link t('two_factor_authentication.account_reset.link') click_button t('account_reset.request.yes_continue') expect(page). @@ -90,7 +90,7 @@ click_link t('two_factor_authentication.login_options_link_text') # Account reset link should not be present - expect(page).to_not have_content(t('devise.two_factor_authentication.account_reset.link')) + expect(page).to_not have_content(t('two_factor_authentication.account_reset.link')) # Visiting account reset directly should redirect to 2FA visit account_reset_request_path diff --git a/spec/features/flows/sp_authentication_flows_spec.rb b/spec/features/flows/sp_authentication_flows_spec.rb index a922cadf94e..3e213eb2a87 100644 --- a/spec/features/flows/sp_authentication_flows_spec.rb +++ b/spec/features/flows/sp_authentication_flows_spec.rb @@ -63,7 +63,7 @@ context 'with SMS delivery' do before do - choose t('devise.two_factor_authentication.otp_delivery_preference.sms') + choose t('two_factor_authentication.otp_delivery_preference.sms') click_send_security_code end @@ -241,7 +241,7 @@ context 'with SMS delivery' do before do - choose t('devise.two_factor_authentication.otp_delivery_preference.sms') + choose t('two_factor_authentication.otp_delivery_preference.sms') click_send_security_code end @@ -252,7 +252,7 @@ context 'with Voice delivery' do before do - choose t('devise.two_factor_authentication.otp_delivery_preference.voice') + choose t('two_factor_authentication.otp_delivery_preference.voice') click_send_security_code end diff --git a/spec/features/idv/phone_otp_rate_limiting_spec.rb b/spec/features/idv/phone_otp_rate_limiting_spec.rb index 713333e2596..925e4e34f2d 100644 --- a/spec/features/idv/phone_otp_rate_limiting_spec.rb +++ b/spec/features/idv/phone_otp_rate_limiting_spec.rb @@ -61,7 +61,7 @@ def expect_max_otp_request_rate_limiting expect(page).to have_content t('titles.account_locked') expect(page).to have_content t( - 'devise.two_factor_authentication.max_otp_requests_reached' + 'two_factor_authentication.max_otp_requests_reached' ) expect_rate_limit_circumvention_to_be_disallowed(user) @@ -83,7 +83,7 @@ def expect_max_otp_request_rate_limiting expect(page).to have_content t('titles.account_locked') expect(page). - to have_content t('devise.two_factor_authentication.max_otp_login_attempts_reached') + to have_content t('two_factor_authentication.max_otp_login_attempts_reached') expect_rate_limit_circumvention_to_be_disallowed(user) expect_rate_limit_to_expire(user) diff --git a/spec/features/idv/steps/phone_otp_delivery_selection_step_spec.rb b/spec/features/idv/steps/phone_otp_delivery_selection_step_spec.rb index 41eb1c7b9d7..2ecd2994560 100644 --- a/spec/features/idv/steps/phone_otp_delivery_selection_step_spec.rb +++ b/spec/features/idv/steps/phone_otp_delivery_selection_step_spec.rb @@ -12,7 +12,7 @@ complete_idv_steps_before_phone_otp_delivery_selection_step choose_idv_otp_delivery_method_sms - expect(page).to have_content(t('devise.two_factor_authentication.header_text')) + expect(page).to have_content(t('two_factor_authentication.header_text')) expect(current_path).to eq(idv_otp_verification_path) end end @@ -26,7 +26,7 @@ complete_idv_steps_before_phone_otp_delivery_selection_step choose_idv_otp_delivery_method_voice - expect(page).to have_content(t('devise.two_factor_authentication.header_text')) + expect(page).to have_content(t('two_factor_authentication.header_text')) expect(current_path).to eq(idv_otp_verification_path) end end diff --git a/spec/features/idv/steps/phone_otp_verification_step_spec.rb b/spec/features/idv/steps/phone_otp_verification_step_spec.rb index 1518517076b..e747892221c 100644 --- a/spec/features/idv/steps/phone_otp_verification_step_spec.rb +++ b/spec/features/idv/steps/phone_otp_verification_step_spec.rb @@ -23,7 +23,7 @@ fill_in 'code', with: '000000' click_submit_default - expect(page).to have_content(t('devise.two_factor_authentication.invalid_otp')) + expect(page).to have_content(t('two_factor_authentication.invalid_otp')) expect(current_path).to eq(idv_otp_verification_path) # Enter the correct code @@ -44,7 +44,7 @@ fill_in(:code, with: otp_code) click_button t('forms.buttons.submit.default') - expect(page).to have_content(t('devise.two_factor_authentication.invalid_otp')) + expect(page).to have_content(t('two_factor_authentication.invalid_otp')) expect(page).to have_current_path(idv_otp_verification_path) end end diff --git a/spec/features/idv/steps/phone_step_spec.rb b/spec/features/idv/steps/phone_step_spec.rb index ce101b65078..4efad3546f0 100644 --- a/spec/features/idv/steps/phone_step_spec.rb +++ b/spec/features/idv/steps/phone_step_spec.rb @@ -39,8 +39,8 @@ choose_idv_otp_delivery_method_sms - expect(page).to have_content(t('devise.two_factor_authentication.header_text')) - expect(page).to_not have_content(t('devise.two_factor_authentication.totp_header_text')) + expect(page).to have_content(t('two_factor_authentication.header_text')) + expect(page).to_not have_content(t('two_factor_authentication.totp_header_text')) expect(page).to_not have_content(t('two_factor_authentication.login_options_link_text')) end end diff --git a/spec/features/openid_connect/openid_connect_spec.rb b/spec/features/openid_connect/openid_connect_spec.rb index 314a4ca0a65..f819872be7c 100644 --- a/spec/features/openid_connect/openid_connect_spec.rb +++ b/spec/features/openid_connect/openid_connect_spec.rb @@ -119,7 +119,7 @@ class MockSession; end fill_in :code, with: 'wrong otp' click_submit_default - expect(page).to have_content(t('devise.two_factor_authentication.invalid_otp')) + expect(page).to have_content(t('two_factor_authentication.invalid_otp')) expect(page.response_headers['Content-Security-Policy']). to(include('form-action \'self\' http://localhost:7654')) click_submit_default diff --git a/spec/features/two_factor_authentication/change_factor_spec.rb b/spec/features/two_factor_authentication/change_factor_spec.rb index 3d2cf3aa677..a1ba3511e10 100644 --- a/spec/features/two_factor_authentication/change_factor_spec.rb +++ b/spec/features/two_factor_authentication/change_factor_spec.rb @@ -33,12 +33,12 @@ expect(page).to have_link t('links.cancel'), href: account_path expect(page).to have_link t('forms.two_factor.try_again'), href: manage_phone_path expect(page).not_to have_content( - t('devise.two_factor_authentication.personal_key_fallback.text_html') + t('two_factor_authentication.personal_key_fallback.text_html') ) enter_incorrect_otp_code - expect(page).to have_content t('devise.two_factor_authentication.invalid_otp') + expect(page).to have_content t('two_factor_authentication.invalid_otp') expect(user.phone_configurations.reload.first.phone).to_not eq new_phone expect(page).to have_link t('forms.two_factor.try_again'), href: manage_phone_path diff --git a/spec/features/two_factor_authentication/sign_in_spec.rb b/spec/features/two_factor_authentication/sign_in_spec.rb index 31ce0e50b10..4956527db46 100644 --- a/spec/features/two_factor_authentication/sign_in_spec.rb +++ b/spec/features/two_factor_authentication/sign_in_spec.rb @@ -51,7 +51,7 @@ expect(page).to have_content t('titles.account_locked') expect(page). - to have_content t('devise.two_factor_authentication.max_otp_login_attempts_reached') + to have_content t('two_factor_authentication.max_otp_login_attempts_reached') end end @@ -67,7 +67,7 @@ expect(current_path).to eq phone_setup_path expect(page).to have_content t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: 'Bahamas' ) @@ -181,7 +181,7 @@ def submit_2fa_setup_form_with_valid_phone expect(current_path).to eq login_two_factor_path(otp_delivery_preference: 'sms') expect(page). - to have_content t('devise.two_factor_authentication.header_text') + to have_content t('two_factor_authentication.header_text') attempt_to_bypass_2fa @@ -293,7 +293,7 @@ def submit_prefilled_otp_code expect(page).to have_content t('titles.account_locked') expect(page).to have_content(five_minute_countdown_regex) - expect(page).to have_content t('devise.two_factor_authentication.max_otp_requests_reached') + expect(page).to have_content t('two_factor_authentication.max_otp_requests_reached') visit root_path signin(user.email, user.password) @@ -301,7 +301,7 @@ def submit_prefilled_otp_code expect(page).to have_content t('titles.account_locked') expect(page).to have_content(five_minute_countdown_regex) expect(page). - to have_content t('devise.two_factor_authentication.max_generic_login_attempts_reached') + to have_content t('two_factor_authentication.max_generic_login_attempts_reached') # let lockout period expire Timecop.travel(lockout_period) do @@ -402,7 +402,7 @@ def submit_prefilled_otp_code signin(first_user.email, first_user.password) - expect(page).to have_content t('devise.two_factor_authentication.max_otp_requests_reached') + expect(page).to have_content t('two_factor_authentication.max_otp_requests_reached') visit account_path expect(current_path).to eq root_path @@ -438,7 +438,7 @@ def submit_prefilled_otp_code allow_any_instance_of(User).to receive(:max_login_attempts?).and_return(true) signin(user.email, user.password) - expect(page).to have_content t('devise.two_factor_authentication.' \ + expect(page).to have_content t('two_factor_authentication.' \ 'max_generic_login_attempts_reached') visit account_path @@ -472,7 +472,7 @@ def submit_prefilled_otp_code click_button t('forms.buttons.submit.default') expect(page). - to_not have_content t('devise.two_factor_authentication.invalid_otp') + to_not have_content t('two_factor_authentication.invalid_otp') end end end @@ -544,7 +544,7 @@ def submit_prefilled_otp_code dn: 'C=US, O=U.S. Government, OU=DoD, OU=PKI, CN=DOE.JOHN.12345', nonce: nonce) expect(current_path).to eq login_two_factor_piv_cac_path - expect(page).to have_content(t('devise.two_factor_authentication.invalid_piv_cac')) + expect(page).to have_content(t('two_factor_authentication.invalid_piv_cac')) end context 'with SMS, international number, and locale header' do @@ -614,7 +614,7 @@ def submit_prefilled_otp_code user = create(:user, :signed_up) sign_in_before_2fa(user) - expect(page).not_to have_link(t('devise.two_factor_authentication.piv_cac_fallback.link')) + expect(page).not_to have_link(t('two_factor_authentication.piv_cac_fallback.link')) end end @@ -660,7 +660,7 @@ def submit_prefilled_otp_code fill_in 'code', with: otp click_submit_default - expect(page).to have_content(t('devise.two_factor_authentication.invalid_otp')) + expect(page).to have_content(t('two_factor_authentication.invalid_otp')) expect(current_path).to eq login_two_factor_authenticator_path end end diff --git a/spec/features/two_factor_authentication/sign_in_via_personal_key_spec.rb b/spec/features/two_factor_authentication/sign_in_via_personal_key_spec.rb index fa68d848a1a..d28fede5c2f 100644 --- a/spec/features/two_factor_authentication/sign_in_via_personal_key_spec.rb +++ b/spec/features/two_factor_authentication/sign_in_via_personal_key_spec.rb @@ -29,7 +29,7 @@ click_submit_default expect(page).to have_content( - t('devise.two_factor_authentication.max_personal_key_login_attempts_reached') + t('two_factor_authentication.max_personal_key_login_attempts_reached') ) end end diff --git a/spec/features/users/sign_in_spec.rb b/spec/features/users/sign_in_spec.rb index 3e27ae5d831..158ff451607 100644 --- a/spec/features/users/sign_in_spec.rb +++ b/spec/features/users/sign_in_spec.rb @@ -330,7 +330,7 @@ expect(page). to have_current_path(login_two_factor_path(otp_delivery_preference: 'sms', reauthn: false)) expect(page).to have_content t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: 'Bermuda' ) expect(user.reload.otp_delivery_preference).to eq 'sms' @@ -351,7 +351,7 @@ expect(page). to have_current_path(login_two_factor_path(otp_delivery_preference: 'sms', reauthn: false)) expect(page).to have_content t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: 'India' ) expect(user.reload.otp_delivery_preference).to eq 'sms' @@ -374,7 +374,7 @@ expect(page). to have_current_path(login_two_factor_path(otp_delivery_preference: 'sms')) expect(page).to have_content t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: 'India' ) expect(user.reload.otp_delivery_preference).to eq 'sms' @@ -397,7 +397,7 @@ expect(page). to have_current_path(login_two_factor_path(otp_delivery_preference: 'sms')) expect(page).to have_content t( - 'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported', + 'two_factor_authentication.otp_delivery_preference.phone_unsupported', location: 'India' ) expect(user.reload.otp_delivery_preference).to eq 'sms' @@ -441,7 +441,7 @@ click_submit_default expect(page).to have_current_path(login_two_factor_personal_key_path) - expect(page).to have_content t('devise.two_factor_authentication.invalid_personal_key') + expect(page).to have_content t('two_factor_authentication.invalid_personal_key') end end @@ -478,7 +478,7 @@ it 'does not display OTP Fallback text and links' do expect(page). - to_not have_content t('devise.two_factor_authentication.totp_fallback.sms_link_text') + to_not have_content t('two_factor_authentication.totp_fallback.sms_link_text') end end end diff --git a/spec/features/users/sign_up_spec.rb b/spec/features/users/sign_up_spec.rb index 575ded876b6..8ebebd41b81 100644 --- a/spec/features/users/sign_up_spec.rb +++ b/spec/features/users/sign_up_spec.rb @@ -173,7 +173,7 @@ expect(page).to have_current_path two_factor_options_path expect(page).not_to have_content( - t('devise.two_factor_authentication.two_factor_choice_options.piv_cac') + t('two_factor_authentication.two_factor_choice_options.piv_cac') ) end diff --git a/spec/features/visitors/phone_confirmation_spec.rb b/spec/features/visitors/phone_confirmation_spec.rb index 4915e1a9462..8fad0e9e74c 100644 --- a/spec/features/visitors/phone_confirmation_spec.rb +++ b/spec/features/visitors/phone_confirmation_spec.rb @@ -77,7 +77,7 @@ click_submit_default expect(@user.phone_configurations.reload).to be_empty - expect(page).to have_content t('devise.two_factor_authentication.invalid_otp') + expect(page).to have_content t('two_factor_authentication.invalid_otp') expect(current_path).to eq login_two_factor_path(otp_delivery_preference: 'sms') end end diff --git a/spec/presenters/two_factor_auth_code/authenticator_delivery_presenter_spec.rb b/spec/presenters/two_factor_auth_code/authenticator_delivery_presenter_spec.rb index 7f4d9f4e860..7eeb436c35b 100644 --- a/spec/presenters/two_factor_auth_code/authenticator_delivery_presenter_spec.rb +++ b/spec/presenters/two_factor_auth_code/authenticator_delivery_presenter_spec.rb @@ -9,7 +9,7 @@ describe '#header' do it 'supplies a header' do - expect(presenter.header).to eq(t('devise.two_factor_authentication.totp_header_text')) + expect(presenter.header).to eq(t('two_factor_authentication.totp_header_text')) end end diff --git a/spec/presenters/two_factor_auth_code/generic_delivery_presenter_spec.rb b/spec/presenters/two_factor_auth_code/generic_delivery_presenter_spec.rb index 394a38e9dd2..23b322e82c9 100644 --- a/spec/presenters/two_factor_auth_code/generic_delivery_presenter_spec.rb +++ b/spec/presenters/two_factor_auth_code/generic_delivery_presenter_spec.rb @@ -25,7 +25,7 @@ it 'returns a link to the piv/cac option' do expect(presenter.send(:piv_cac_option)).to eq t( - 'devise.two_factor_authentication.piv_cac_fallback.text_html', + 'two_factor_authentication.piv_cac_fallback.text_html', link: presenter.send(:piv_cac_link) ) end @@ -46,7 +46,7 @@ it 'returns a link to the piv/cac option' do expect(presenter.send(:piv_cac_link)).to eq ActionController::Base.new.view_context.link_to( - t('devise.two_factor_authentication.piv_cac_fallback.link'), + t('two_factor_authentication.piv_cac_fallback.link'), login_two_factor_piv_cac_path(locale: LinkLocaleResolver.locale) ) 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 4650062ec07..4bb56e1e613 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 @@ -58,14 +58,14 @@ end def account_reset_cancel_link(account_reset_token) - I18n.t('devise.two_factor_authentication.account_reset.pending_html', cancel_link: - view.link_to(t('devise.two_factor_authentication.account_reset.cancel_link'), + I18n.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))) end def account_reset_delete_account_link - I18n.t('devise.two_factor_authentication.account_reset.text_html', link: - view.link_to(t('devise.two_factor_authentication.account_reset.link'), + I18n.t('two_factor_authentication.account_reset.text_html', link: + view.link_to(t('two_factor_authentication.account_reset.link'), account_reset_request_path(locale: LinkLocaleResolver.locale))) end end 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 9449d4137e0..b9282a9e425 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 @@ -13,7 +13,7 @@ def presenter_with(arguments = {}, view = ActionController::Base.new.view_contex let(:presenter) { presenter_with(reauthn: reauthn, user_email: user_email) } describe '#header' do - let(:expected_header) { t('devise.two_factor_authentication.piv_cac_header_text') } + let(:expected_header) { t('two_factor_authentication.piv_cac_header_text') } it { expect(presenter.header).to eq expected_header } end diff --git a/spec/presenters/two_factor_login_options_presenter_spec.rb b/spec/presenters/two_factor_login_options_presenter_spec.rb index c39f5d4bcd5..660413baace 100644 --- a/spec/presenters/two_factor_login_options_presenter_spec.rb +++ b/spec/presenters/two_factor_login_options_presenter_spec.rb @@ -27,9 +27,9 @@ receive(:account_reset_token).and_return('foo') expect(presenter.account_reset_or_cancel_link).to eq \ - t('devise.two_factor_authentication.account_reset.pending_html', + t('two_factor_authentication.account_reset.pending_html', cancel_link: view.link_to( - t('devise.two_factor_authentication.account_reset.cancel_link'), + t('two_factor_authentication.account_reset.cancel_link'), account_reset_cancel_url(token: 'foo') )) end @@ -39,9 +39,9 @@ receive(:account_reset_token_valid?).and_return(false) expect(presenter.account_reset_or_cancel_link).to eq \ - t('devise.two_factor_authentication.account_reset.text_html', + t('two_factor_authentication.account_reset.text_html', link: view.link_to( - t('devise.two_factor_authentication.account_reset.link'), + t('two_factor_authentication.account_reset.link'), account_reset_request_path(locale: LinkLocaleResolver.locale) )) end diff --git a/spec/support/features/idv_helper.rb b/spec/support/features/idv_helper.rb index 33980872edb..5d5b14806d3 100644 --- a/spec/support/features/idv_helper.rb +++ b/spec/support/features/idv_helper.rb @@ -73,7 +73,7 @@ def choose_idv_otp_delivery_method_sms def choose_idv_otp_delivery_method_voice page.find( 'label', - text: t('devise.two_factor_authentication.otp_delivery_preference.voice') + text: t('two_factor_authentication.otp_delivery_preference.voice') ).click click_on t('idv.buttons.send_confirmation_code') end diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb index 5d8f458b1a2..d3d69b52678 100644 --- a/spec/support/features/session_helper.rb +++ b/spec/support/features/session_helper.rb @@ -422,7 +422,7 @@ def register_user_with_piv_cac(email = 'test@test.com') expect(page).to have_current_path two_factor_options_path expect(page).to have_content( - t('devise.two_factor_authentication.two_factor_choice_options.piv_cac') + t('two_factor_authentication.two_factor_choice_options.piv_cac') ) set_up_2fa_with_piv_cac diff --git a/spec/views/two_factor_authentication/otp_verification/show.html.slim_spec.rb b/spec/views/two_factor_authentication/otp_verification/show.html.slim_spec.rb index 2f39b20e64e..3decf89da77 100644 --- a/spec/views/two_factor_authentication/otp_verification/show.html.slim_spec.rb +++ b/spec/views/two_factor_authentication/otp_verification/show.html.slim_spec.rb @@ -35,7 +35,7 @@ it 'has a localized heading' do render - expect(rendered).to have_content t('devise.two_factor_authentication.header_text') + expect(rendered).to have_content t('two_factor_authentication.header_text') end end @@ -138,7 +138,7 @@ render expect(rendered).not_to have_link( - t('devise.two_factor_authentication.personal_key_fallback.link'), + t('two_factor_authentication.personal_key_fallback.link'), href: login_two_factor_personal_key_path ) end diff --git a/spec/views/two_factor_authentication/personal_key_verification/show.html.slim_spec.rb b/spec/views/two_factor_authentication/personal_key_verification/show.html.slim_spec.rb index c616b68c0a8..57de794f908 100644 --- a/spec/views/two_factor_authentication/personal_key_verification/show.html.slim_spec.rb +++ b/spec/views/two_factor_authentication/personal_key_verification/show.html.slim_spec.rb @@ -21,14 +21,14 @@ render expect(rendered). - to have_content t('devise.two_factor_authentication.personal_key_header_text') + to have_content t('two_factor_authentication.personal_key_header_text') end it 'prompts the user to enter their personal key' do render expect(rendered). - to have_content t('devise.two_factor_authentication.personal_key_prompt') + to have_content t('two_factor_authentication.personal_key_prompt') end it 'contains a form to submit the personal key' do diff --git a/spec/views/two_factor_authentication/totp_verification/show.html.slim_spec.rb b/spec/views/two_factor_authentication/totp_verification/show.html.slim_spec.rb index 18312877504..35277565829 100644 --- a/spec/views/two_factor_authentication/totp_verification/show.html.slim_spec.rb +++ b/spec/views/two_factor_authentication/totp_verification/show.html.slim_spec.rb @@ -23,7 +23,7 @@ it_behaves_like 'an otp form' it 'shows the correct header' do - expect(rendered).to have_content t('devise.two_factor_authentication.totp_header_text') + expect(rendered).to have_content t('two_factor_authentication.totp_header_text') end it 'shows the correct help text' do