From 304457d7082b7fbc95b2932c56b559c5fd9cc641 Mon Sep 17 00:00:00 2001 From: Adam Biagianti Date: Mon, 5 Jun 2017 11:44:31 -0400 Subject: [PATCH] Use single link in account password reset partial **Why**: We have a new page with two choices for reactivating an account, so having two links on the /account page is redundant --- app/views/accounts/_password_reset.html.slim | 3 +-- config/locales/account/en.yml | 4 +--- config/locales/account/es.yml | 3 +-- spec/views/accounts/show.html.slim_spec.rb | 5 ++--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/views/accounts/_password_reset.html.slim b/app/views/accounts/_password_reset.html.slim index eaa375b4a09..ab541b0f1e8 100644 --- a/app/views/accounts/_password_reset.html.slim +++ b/app/views/accounts/_password_reset.html.slim @@ -1,4 +1,3 @@ .mb4.alert.alert-warning p = t('account.index.reactivation.instructions') - p.mb0 = link_to t('account.index.reactivation.personal_key'), reactivate_account_path - p.mb0.mt2 = link_to t('account.index.reactivation.reverify'), verify_path + p.mb0 = link_to t('account.index.reactivation.link'), manage_reactivate_account_path diff --git a/config/locales/account/en.yml b/config/locales/account/en.yml index e70ce09e8d2..598b0a31909 100644 --- a/config/locales/account/en.yml +++ b/config/locales/account/en.yml @@ -15,9 +15,7 @@ en: previous_address: Previous address reactivation: instructions: Your profile was recently deactivated due to a password reset. - You can use your personal key to reactivate your profile. - personal_key: Reactivate your profile with your personal key. - reverify: No personal key? Reverify all your information instead. + link: Reactivate your profile now. ssn: Social Security Number verification: instructions: Your account requires a secret code to be verified. diff --git a/config/locales/account/es.yml b/config/locales/account/es.yml index eab2ca58c9d..27f9b56a511 100644 --- a/config/locales/account/es.yml +++ b/config/locales/account/es.yml @@ -15,8 +15,7 @@ es: previous_address: NOT TRANSLATED YET reactivation: instructions: NOT TRANSLATED YET - personal_key: NOT TRANSLATED YET - reverify: NOT TRANSLATED YET + link: NOT TRANSLATED YET ssn: NOT TRANSLATED YET verification: instructions: NOT TRANSLATED YET diff --git a/spec/views/accounts/show.html.slim_spec.rb b/spec/views/accounts/show.html.slim_spec.rb index 2ffdd21637e..4d6c9e1c826 100644 --- a/spec/views/accounts/show.html.slim_spec.rb +++ b/spec/views/accounts/show.html.slim_spec.rb @@ -92,9 +92,8 @@ it 'contains link to reactivate profile via personal key or reverification' do render - expect(rendered).to have_link(t('account.index.reactivation.personal_key'), - href: reactivate_account_path) - expect(rendered).to have_link(t('account.index.reactivation.reverify'), href: verify_path) + expect(rendered).to have_link(t('account.index.reactivation.link'), + href: manage_reactivate_account_path) end end