Skip to content

Use single link in account password reset partial #1473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
el-mapache merged 1 commit into from
Jun 5, 2017
Merged

Use single link in account password reset partial #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/views/accounts/_password_reset.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions config/locales/account/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions config/locales/account/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions spec/views/accounts/show.html.slim_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down