Skip to content

Commit

Permalink
Merge pull request #1841 from 18F/nb-update-verified-message
Browse files Browse the repository at this point in the history
Update verify messages with app name
  • Loading branch information
nickbristow authored Dec 5, 2017
2 parents e1dcd65 + d7d6e0c commit 4c17739
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/view_models/sign_up_completions_show.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def initialize(loa3_requested:, decorated_session:, current_user:)
# rubocop:disable Rails/OutputSafety
def heading
if requested_loa == 'loa3'
content_tag(:strong, I18n.t('titles.sign_up.verified'))
content_tag(:strong, I18n.t('titles.sign_up.verified', app: APP_NAME))
else
safe_join([I18n.t(
'titles.sign_up.completion_html',
Expand Down
4 changes: 2 additions & 2 deletions app/views/sign_up/completions/_show_identities.html.slim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- identities = @view_model.identities
.mt2.mb3.p3.col-12.center.border-box.border.border-teal.rounded-xl
p
.mt2.mb3.py2.px3.col-12.center.border-box.border.border-teal.rounded-xl
p.fs-20p
- if identities.length > 1
= t('idv.messages.agencies_login')
- else
Expand Down
4 changes: 2 additions & 2 deletions app/views/sign_up/completions/_show_sp.html.slim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.mt2.p3.col-12.center.border-box.border.border-teal.rounded-xl
p = t('idv.messages.return_to_sp_html', sp: decorated_session.sp_name)
.mt2.px3.py2.col-12.center.border-box.border.border-teal.rounded-xl
p.fs-20p = t('idv.messages.return_to_sp_html', sp: decorated_session.sp_name)
p
= button_to t('forms.buttons.continue'), sign_up_completed_path, \
class: 'btn btn-primary btn-wide'
Expand Down
14 changes: 6 additions & 8 deletions app/views/sign_up/completions/show.html.slim
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
-title @view_model.title
.clearfix.col-10.sm-col-12.mx-auto
.center
= image_tag(asset_url(@view_model.image_name), width: 140, alt: '', class: 'mb2')
h1.h3.mb2.my0.px1.center = @view_model.heading

.clearfix
.col-10.sm-col-12.mx-auto
.center
= image_tag(asset_url(@view_model.image_name), width: 140, alt: '', class: 'mb2')
h1.h3.mb3.my0.regular.center = @view_model.heading
= render @view_model.service_provider_partial

= render @view_model.service_provider_partial

= link_to t('idv.messages.return_to_profile'), profile_path
= link_to t('idv.messages.return_to_profile'), profile_path
11 changes: 6 additions & 5 deletions app/views/verify/_hardfail4.html.slim
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
p.mb1 = t('idv.messages.hardfail', hours: Figaro.env.idv_attempt_window_in_hours)
.mt2.p3.col-12.center.border-box.border.border-teal.rounded-xl
p.mb3.fs-20p = t('idv.messages.hardfail4_html', sp: decorated_session.sp_name)
= link_to t('idv.buttons.continue_plain'),
decorated_session.sp_return_url,
class: 'btn btn-primary btn-wide'
.mt2.py2.px3.col-12.center.border-box.border.border-teal.rounded-xl
p.fs-20p = t('idv.messages.hardfail4_html', sp: decorated_session.sp_name)
p
= link_to t('idv.buttons.continue_plain'),
decorated_session.sp_return_url,
class: 'btn btn-primary btn-wide'
hr.mt2
.mt2 = link_to t('idv.messages.help_center_html').strip_html_tags, MarketingSite.help_url
.mt2
Expand Down
10 changes: 5 additions & 5 deletions app/views/verify/_no_sp_hardfail.html.slim
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.mt2.p3.col-12.center.border-box.border.border-teal.rounded-xl
p.mb3.fs-20p
.mt2.py2.px3.col-12.center.border-box.border.border-teal.rounded-xl
p.fs-20p
= t('idv.messages.help_center_html')
= link_to t('idv.buttons.continue_plain'),
MarketingSite.help_url,
class: 'btn btn-primary btn-wide'
p = link_to t('idv.buttons.continue_plain'),
MarketingSite.help_url,
class: 'btn btn-primary btn-wide'
hr.mt2
.mt2
= link_to t('idv.messages.return_to_profile', app: APP_NAME), profile_path
17 changes: 9 additions & 8 deletions app/views/verify/fail.html.slim
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
- title t('idv.titles.hardfail')
.clearfix.col-10.sm-col-12.mx-auto
.center
= image_tag(asset_url('no-verify.svg'),
alt: '',
class: 'mb2',
width: 140)

.mb1.sm-m0.center.pb1
= image_tag(asset_url('no-verify.svg'),
alt: '',
class: 'align-bottom',
width: 170)
h1.h3.mt0.center.px6
= t('idv.titles.hardfail')
= render decorated_session.idv_hardfail4_partial
h1.h3.mb2.my0.px1.center = t('idv.titles.hardfail', app: APP_NAME)

= render decorated_session.idv_hardfail4_partial
2 changes: 1 addition & 1 deletion config/locales/idv/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ en:
expectations: Next, help us identify you
fail: We were unable to verify your identity
financials: Provide a financial account number
hardfail: We weren't able to verify your identity
hardfail: We weren't able to verify your identity with %{app}
intro: Help us identify you
mail:
resend: Want another letter?
Expand Down
2 changes: 1 addition & 1 deletion config/locales/idv/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ es:
expectations: A continuación, ayúdenos a identificarlo.
fail: No pudimos verificar su identidad.
financials: Proporcione un número de cuenta financiera.
hardfail: No pudimos verificar su identidad.
hardfail: No pudimos verificar su identidad con %{app}.
intro: Ayúdenos a identificarlo
mail:
resend: "¿Desea otra carta?"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/idv/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ fr:
expectations: Ensuite, aidez-vous à vous identifier
fail: Nous sommes dans l'incapacité de vérifier votre identité pour le moment
financials: Veuillez fournir un numéro de compte bancaire
hardfail: Nous sommes dans l'incapacité de vérifier votre identité
hardfail: Nous sommes dans l'incapacité de vérifier votre identité avec %{app}
intro: Aidez-nous à vous identifier
mail:
resend: Vous voulez une autre lettre?
Expand Down
2 changes: 1 addition & 1 deletion config/locales/titles/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ en:
sign_up:
completion_html: You have %{accent} with %{app}
loa1: created your account
verified: You have verified your identity.
verified: You have verified your identity with %{app}
totp_setup:
new: Set up two-factor authentication
two_factor_setup: Two-factor authentication setup
Expand Down
2 changes: 1 addition & 1 deletion config/locales/titles/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ es:
sign_up:
completion_html: Tiene %{accent} con %{app}
loa1: creó su cuenta
verified: Tiene verificó su identidad.
verified: Tiene verificó su identidad con %{app}
totp_setup:
new: Configure la autenticación de dos factores
two_factor_setup: Configuración de autenticación de dos factores
Expand Down
2 changes: 1 addition & 1 deletion config/locales/titles/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fr:
sign_up:
completion_html: Vous avez %{accent} avec %{app}
loa1: créé votre compte
verified: Vous avez verifié votre identité.
verified: Vous avez verifié votre identité avec %{app}
totp_setup:
new: Configurer l'authentification à deux facteurs
two_factor_setup: Configuration de l'authentification à deux facteurs
Expand Down
3 changes: 2 additions & 1 deletion spec/support/idv_examples/account_creation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
click_acknowledge_personal_key

expect(page).to have_content t(
'titles.sign_up.verified'
'titles.sign_up.verified',
app: APP_NAME
)
within('.requested-attributes') do
expect(page).to have_content t('help_text.requested_attributes.email')
Expand Down

0 comments on commit 4c17739

Please sign in to comment.