LG-14607: generic email sharing message

app/views/accounts/connected_accounts/selected_email/edit.html.erb

@@ -4,7 +4,7 @@
   <% c.with_header(id: 'select-email-heading') { t('titles.select_email') } %>
 
   <p id="select-email-intro">
-    <%= t('help_text.select_preferred_email', sp: @identity.display_name, app_name: APP_NAME) %>
+    <%= t('help_text.select_preferred_email_html', sp: @identity.display_name) %>
   </p>
 
   <%= simple_form_for(
@@ -30,7 +30,7 @@
             ]
           end,
         ) %>
-    <%= f.submit(t('help_text.requested_attributes.change_email_link'), class: 'margin-top-1') %>
+    <%= f.submit(t('help_text.requested_attributes.select_email_link'), class: 'margin-top-1') %>
   <% end %>
 
   <%= render ButtonComponent.new(

app/views/sign_up/select_email/show.html.erb

@@ -4,7 +4,7 @@
   <% c.with_header(id: 'select-email-heading') { t('titles.select_email') } %>
 
   <p id="select-email-intro">
-    <%= I18n.t('help_text.select_preferred_email', sp: @sp_name, app_name: APP_NAME) %>
+    <%= I18n.t('help_text.select_preferred_email_html', sp: @sp_name) %>
   </p>
 
   <%= simple_form_for(@select_email_form, url: sign_up_select_email_path) do |f| %>
@@ -26,7 +26,7 @@
             ]
           end,
         ) %>
-    <%= f.submit t('help_text.requested_attributes.change_email_link'), class: 'margin-top-1' %>
+    <%= f.submit t('help_text.requested_attributes.select_email_link'), class: 'margin-top-1' %>
   <% end %>
 
   <%= render ButtonComponent.new(

config/locales/en.yml

@@ -976,11 +976,12 @@ help_text.requested_attributes.full_name: Full name
 help_text.requested_attributes.ial2_reverified_consent_info_html: 'Because you verified your identity again, we need your permission to share this information with %{sp_html}:'
 help_text.requested_attributes.intro_html: 'We’ll share this information with %{sp_html}:'
 help_text.requested_attributes.phone: Phone number
+help_text.requested_attributes.select_email_link: Select email
 help_text.requested_attributes.social_security_number: Social Security number
 help_text.requested_attributes.verified_at: Updated on
 help_text.requested_attributes.x509_issuer: PIV/CAC Issuer
 help_text.requested_attributes.x509_subject: PIV/CAC Identity
-help_text.select_preferred_email: You may change which email you share with %{sp} since you have multiple emails associated with your %{app_name} account.
+help_text.select_preferred_email_html: Select or add the email you’d like to use to access <strong>%{sp}</strong>.
 i18n.language: Language
 i18n.locale.en: English
 i18n.locale.es: Español

config/locales/es.yml

@@ -987,11 +987,12 @@ help_text.requested_attributes.full_name: Nombre completo
 help_text.requested_attributes.ial2_reverified_consent_info_html: 'Como volvió a verificar su identidad, necesitamos su permiso para divulgar esta información a %{sp_html}:'
 help_text.requested_attributes.intro_html: 'Divulgaremos esta información a %{sp_html}:'
 help_text.requested_attributes.phone: Número de teléfono
+help_text.requested_attributes.select_email_link: Seleccionar correo electrónico
 help_text.requested_attributes.social_security_number: Número de Seguro Social
 help_text.requested_attributes.verified_at: Actualizado en
 help_text.requested_attributes.x509_issuer: Emisor de la tarjeta PIV o CAC
 help_text.requested_attributes.x509_subject: Identidad de la tarjeta PIV o CAC
-help_text.select_preferred_email: Puede cambiar el correo electrónico que comparte con %{sp} ya que tiene varios correos electrónicos asociados a su cuenta de %{app_name}.
+help_text.select_preferred_email_html: Seleccione o agregue el correo electrónico que desea utilizar para acceder a <strong>%{sp}</strong>.
 i18n.language: Idioma
 i18n.locale.en: English
 i18n.locale.es: Español

config/locales/fr.yml

@@ -976,11 +976,12 @@ help_text.requested_attributes.full_name: Nom complet
 help_text.requested_attributes.ial2_reverified_consent_info_html: 'Étant donné que vous avez revérifié votre identité, nous avons besoin de votre autorisation pour partager ces informations avec %{sp_html} :'
 help_text.requested_attributes.intro_html: 'Nous partagerons ces informations avec %{sp_html}:'
 help_text.requested_attributes.phone: Numéro de téléphone
+help_text.requested_attributes.select_email_link: Sélectionner l’e-mail
 help_text.requested_attributes.social_security_number: Numéro de sécurité sociale
 help_text.requested_attributes.verified_at: Mis à jour le
 help_text.requested_attributes.x509_issuer: Émetteur PIV/CAC
 help_text.requested_attributes.x509_subject: Identité PIV/CAC
-help_text.select_preferred_email: Vous pouvez modifier l’adresse e-mail que vous partagez avec %{sp} car vous possédez plusieurs adresses e-mail associées à votre compte %{app_name}.
+help_text.select_preferred_email_html: Sélectionnez ou ajoutez l’adresse e-mail que vous souhaitez employer pour accéder à <strong>%{sp}</strong>.
 i18n.language: Langue
 i18n.locale.en: English
 i18n.locale.es: Español

config/locales/zh.yml

@@ -989,11 +989,12 @@ help_text.requested_attributes.full_name: 姓名
 help_text.requested_attributes.ial2_reverified_consent_info_html: '因为你重新验证了身份，我们需要得到你的许可才能与 %{sp_html} 分享该信息。'
 help_text.requested_attributes.intro_html: 我们会与 %{sp_html} 分享这些信息：
 help_text.requested_attributes.phone: 电话号码
+help_text.requested_attributes.select_email_link: 选择电邮
 help_text.requested_attributes.social_security_number: 社会保障号码
 help_text.requested_attributes.verified_at: 更新是在
 help_text.requested_attributes.x509_issuer: PIV/CAC 发放方
 help_text.requested_attributes.x509_subject: PIV/CAC 身份
-help_text.select_preferred_email: 因为你有多个电邮与 %{app_name} 账户相关，你可以更改与我们 %{sp} 构分享哪个。
+help_text.select_preferred_email_html: 选择或添加你想用来访问<strong>%{sp}</strong>的电子邮件。
 i18n.language: 语言
 i18n.locale.en: English
 i18n.locale.es: Español

spec/features/account_connected_apps_spec.rb

@@ -87,7 +87,7 @@
     expect(page).to have_field(user.email) { |field| !field[:checked] }
 
     choose user.email
-    click_on t('help_text.requested_attributes.change_email_link')
+    click_on t('help_text.requested_attributes.select_email_link')
 
     within('li', text: identity.display_name) do
       expect(page).not_to have_content(t('account.connected_apps.email_not_selected'))
@@ -97,7 +97,7 @@
 
     expect(page).to have_field(user.email) { |field| field[:checked] }
 
-    click_on(t('help_text.requested_attributes.change_email_link'))
+    click_on(t('help_text.requested_attributes.select_email_link'))
 
     expect(page).to have_content strip_tags(
       t('account.connected_apps.email_update_success_html', sp_name: identity.display_name),

spec/features/multiple_emails/sp_sign_in_spec.rb

@@ -36,7 +36,7 @@
 
       choose emails.second
 
-      click_button(t('help_text.requested_attributes.change_email_link'))
+      click_button(t('help_text.requested_attributes.select_email_link'))
 
       expect(current_path).to eq(sign_up_completed_path)
       click_agree_and_continue
@@ -55,7 +55,7 @@
       click_submit_default
       click_link(t('help_text.requested_attributes.change_email_link'))
       choose email2.email
-      click_button(t('help_text.requested_attributes.change_email_link'))
+      click_button(t('help_text.requested_attributes.select_email_link'))
       expect(current_path).to eq(sign_up_completed_path)
       click_agree_and_continue
       click_submit_default
@@ -103,7 +103,7 @@
 
       click_link(t('help_text.requested_attributes.change_email_link'))
       choose emails.second
-      click_button(t('help_text.requested_attributes.change_email_link'))
+      click_button(t('help_text.requested_attributes.select_email_link'))
 
       expect(current_path).to eq(sign_up_completed_path)
 
@@ -127,7 +127,7 @@
       click_submit_default_twice
       click_link(t('help_text.requested_attributes.change_email_link'))
       choose email2.email
-      click_button(t('help_text.requested_attributes.change_email_link'))
+      click_button(t('help_text.requested_attributes.select_email_link'))
       expect(current_path).to eq(sign_up_completed_path)
       click_agree_and_continue
       click_submit_default

spec/views/accounts/connected_accounts/selected_email/edit.html.erb_spec.rb

@@ -27,9 +27,6 @@
     inputs = page.find_all('[type="radio"]')
     expect(inputs.count).to eq(2)
     expect(inputs).to be_logically_grouped(t('titles.select_email'))
-    fieldset = page.find('fieldset')
-    expect(fieldset).to have_description(
-      t('help_text.select_preferred_email', sp: identity.display_name, app_name: APP_NAME),
-    )
+    expect(rendered).to have_content(identity.display_name)
   end
 end