diff --git a/app/services/marketing_site.rb b/app/services/marketing_site.rb index b44d1b17cbb..ec705a00249 100644 --- a/app/services/marketing_site.rb +++ b/app/services/marketing_site.rb @@ -10,6 +10,7 @@ class UnknownArticleException < StandardError; end manage-your-account/add-or-change-your-authentication-method manage-your-account/delete-your-account manage-your-account/personal-key + manage-your-account/resolve-duplicate-accounts trouble-signing-in/face-or-touch-unlock trouble-signing-in/forgot-your-password trouble-signing-in/forgot-your-personal-key diff --git a/app/views/duplicate_profiles_detected/show.html.erb b/app/views/duplicate_profiles_detected/show.html.erb index ec486c7434c..24350e9bae6 100644 --- a/app/views/duplicate_profiles_detected/show.html.erb +++ b/app/views/duplicate_profiles_detected/show.html.erb @@ -3,7 +3,19 @@ <%= render StatusPageComponent.new(status: :warning) do |c| %> <% c.with_header { @dupe_profiles_detected_presenter.heading } %> -
<%= t('duplicate_profiles_detected.intro', app_name: APP_NAME) %>
++ <%= t( + 'duplicate_profiles_detected.intro_html', + link_html: new_tab_link_to( + t('duplicate_profiles_detected.intro.link'), + MarketingSite.help_center_article_url( + category: 'manage-your-account', + article: 'resolve-duplicate-accounts', + ), + ), + app_name: APP_NAME, + ) %> +
<%= t('duplicate_profiles_detected.intro2', app_name: APP_NAME) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 13fb4b33352..0526cbedda7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -738,18 +738,19 @@ duplicate_profiles_detected.accounts_list.heading: Accounts with the same verifi duplicate_profiles_detected.cant_access: 'I can’t access an account' duplicate_profiles_detected.connected_acct_html: ' Connected agencies: %{count}' duplicate_profiles_detected.created_at_html: ' Created: %{timestamp_html}' -duplicate_profiles_detected.delete_duplicates.details_html: Sign in, authenticate, and delete the account from the ‘Your account’ page. %{link_html} -duplicate_profiles_detected.delete_duplicates.heading: 'Delete the duplicate accounts' +duplicate_profiles_detected.delete_duplicates.details_html: Sign in and delete the account from the “Your account” page. %{link_html} +duplicate_profiles_detected.delete_duplicates.heading: 'Delete the duplicate account(s)' duplicate_profiles_detected.delete_duplicates.link: How to delete your account. duplicate_profiles_detected.dont_recognize_account: I don’t recognize an account above duplicate_profiles_detected.duplicate: Duplicate duplicate_profiles_detected.get_help: Get Help duplicate_profiles_detected.heading: We found other accounts that may be yours -duplicate_profiles_detected.intro: The %{app_name} requires that you only have one identity verified %{app_name} account. Learn more about duplicate accounts -duplicate_profiles_detected.intro2: 'You need to delete the duplicate accounts before signing into %{app_name}. Here’s what to do:' +duplicate_profiles_detected.intro_html: '%{app_name} requires that you only have one identity verified %{app_name} account. %{link_html}' +duplicate_profiles_detected.intro.link: Learn more about duplicate accounts. +duplicate_profiles_detected.intro2: 'You need to delete duplicate accounts before signing into %{app_name}. Here’s what to do:' duplicate_profiles_detected.last_sign_in_at_html: ' Last login: %{timestamp_html}' duplicate_profiles_detected.never_logged_in: Never logged in -duplicate_profiles_detected.select_an_account.details: Keep the account that you’ve connected to the most agencies. That way you don’t have to reconnect to all the agencies you use. +duplicate_profiles_detected.select_an_account.details: Keep the account you use the most. For example, the one tied to the most services. That way, you won’t have to reconnect services. duplicate_profiles_detected.select_an_account.heading: Choose an account to keep duplicate_profiles_detected.sign_back_in.details: Go back to the %{app_name} website and sign in using the one %{app_name} account you kept. duplicate_profiles_detected.sign_back_in.heading: Sign back into %{app_name} with one account diff --git a/config/locales/es.yml b/config/locales/es.yml index 27a9b54813c..cc49dadb860 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -745,26 +745,27 @@ doc_auth.tips.document_capture_selfie_text1: Quite cualquier prenda o accesorio doc_auth.tips.document_capture_selfie_text2: Tómese la foto en un lugar bien iluminado doc_auth.tips.document_capture_selfie_text3: Mantenga una expresión neutral doc_auth.tips.document_capture_selfie_text4: Revise que se vea su rostro completo dentro del círculo verde. -duplicate_profiles_detected.accounts_list.heading: Accounts with the same verified information -duplicate_profiles_detected.cant_access: 'I can’t access an account' +duplicate_profiles_detected.accounts_list.heading: Cuentas con la misma información verificada +duplicate_profiles_detected.cant_access: 'No puedo acceder a una cuenta' duplicate_profiles_detected.connected_acct_html: ' Connected agencies: %{count}' duplicate_profiles_detected.created_at_html: ' Created: %{timestamp_html}' -duplicate_profiles_detected.delete_duplicates.details_html: Sign in, authenticate, and delete the account from the ‘Your account’ page. %{link_html} -duplicate_profiles_detected.delete_duplicates.heading: 'Delete the duplicate accounts' -duplicate_profiles_detected.delete_duplicates.link: How to delete your account. -duplicate_profiles_detected.dont_recognize_account: I don’t recognize an account above +duplicate_profiles_detected.delete_duplicates.details_html: Inicie sesión y, en la página de “Su cuenta”, elimine la cuenta. %{link_html} +duplicate_profiles_detected.delete_duplicates.heading: 'Elimine las cuentas duplicadas.' +duplicate_profiles_detected.delete_duplicates.link: Cómo eliminar su cuenta. +duplicate_profiles_detected.dont_recognize_account: No reconozco una de estas cuentas duplicate_profiles_detected.duplicate: Duplicate -duplicate_profiles_detected.get_help: Get Help -duplicate_profiles_detected.heading: We found other accounts that may be yours -duplicate_profiles_detected.intro: The %{app_name} requires that you only have one identity verified %{app_name} account. Learn more about duplicate accounts -duplicate_profiles_detected.intro2: 'You need to delete the duplicate accounts before signing into %{app_name}. Here’s what to do:' +duplicate_profiles_detected.get_help: Obtener ayuda +duplicate_profiles_detected.heading: Encontramos otras cuentas que pueden ser suyas +duplicate_profiles_detected.intro_html: '%{app_name} requiere que usted tenga una sola cuenta de %{app_name} en la cual haya verificado su identidad. %{link_html}' +duplicate_profiles_detected.intro.link: Obtenga más información acerca de las cuentas duplicadas. +duplicate_profiles_detected.intro2: 'Antes de iniciar sesión en %{app_name}, necesita eliminar las cuentas duplicadas. Esto es lo que tiene que hacer:' duplicate_profiles_detected.last_sign_in_at_html: ' Last login: %{timestamp_html}' duplicate_profiles_detected.never_logged_in: Never logged in -duplicate_profiles_detected.select_an_account.details: Keep the account that you’ve connected to the most agencies. That way you don’t have to reconnect to all the agencies you use. -duplicate_profiles_detected.select_an_account.heading: Choose an account to keep -duplicate_profiles_detected.sign_back_in.details: Go back to the %{app_name} website and sign in using the one %{app_name} account you kept. -duplicate_profiles_detected.sign_back_in.heading: Sign back into %{app_name} with one account -duplicate_profiles_detected.sign_out: Sign out +duplicate_profiles_detected.select_an_account.details: Conserve la cuenta que más usa. Por ejemplo, la que está vinculada a más servicios. Así, no tendrá que volver a conectar los servicios. +duplicate_profiles_detected.select_an_account.heading: Elija la cuenta que desea conservar. +duplicate_profiles_detected.sign_back_in.details: Vuelva al sitio web de %{app_name} e inicie sesión usando la cuenta de %{app_name} que conservó. +duplicate_profiles_detected.sign_back_in.heading: Vuelva a iniciar sesión en %{app_name} con una cuenta. +duplicate_profiles_detected.sign_out: Cerrar sesión duplicate_profiles_detected.signed_in: Signed In email_address.not_found: El correo electrónico no encontrado email_addresses.add.duplicate: Esta dirección de correo electrónico ya está registrada en su cuenta. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a3a67e7dcad..c0e32f655bb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -734,26 +734,27 @@ doc_auth.tips.document_capture_selfie_text1: Enlevez tout ce qui cache votre vis doc_auth.tips.document_capture_selfie_text2: Prenez votre photo dans un endroit bien éclairé doc_auth.tips.document_capture_selfie_text3: Gardez une expression neutre doc_auth.tips.document_capture_selfie_text4: Assurez-vous que l’ensemble de votre visage est visible dans le cercle vert -duplicate_profiles_detected.accounts_list.heading: Accounts with the same verified information -duplicate_profiles_detected.cant_access: 'I can’t access an account' +duplicate_profiles_detected.accounts_list.heading: Comptes ayant les mêmes informations vérifiées +duplicate_profiles_detected.cant_access: 'Je ne peux pas accéder à un compte' duplicate_profiles_detected.connected_acct_html: ' Connected agencies: %{count}' duplicate_profiles_detected.created_at_html: ' Created: %{timestamp_html}' -duplicate_profiles_detected.delete_duplicates.details_html: Sign in, authenticate, and delete the account from the ‘Your account’ page. %{link_html} -duplicate_profiles_detected.delete_duplicates.heading: 'Delete the duplicate accounts' -duplicate_profiles_detected.delete_duplicates.link: How to delete your account. -duplicate_profiles_detected.dont_recognize_account: I don’t recognize an account above +duplicate_profiles_detected.delete_duplicates.details_html: Connectez-vous au compte puis supprimez-le depuis la page « Votre compte » . %{link_html} +duplicate_profiles_detected.delete_duplicates.heading: 'Supprimer le(s) compte(s) en double' +duplicate_profiles_detected.delete_duplicates.link: 'Comment supprimer votre compte :' +duplicate_profiles_detected.dont_recognize_account: Je ne reconnais pas l’un des comptes ci-dessus duplicate_profiles_detected.duplicate: Duplicate -duplicate_profiles_detected.get_help: Get Help -duplicate_profiles_detected.heading: We found other accounts that may be yours -duplicate_profiles_detected.intro: The %{app_name} requires that you only have one identity verified %{app_name} account. Learn more about duplicate accounts -duplicate_profiles_detected.intro2: 'You need to delete the duplicate accounts before signing into %{app_name}. Here’s what to do:' +duplicate_profiles_detected.get_help: Obtenir de l’aide +duplicate_profiles_detected.heading: Nous avons trouvé d’autres comptes susceptibles de vous appartenir +duplicate_profiles_detected.intro_html: Pour accéder à %{app_name}, vous devez disposer d’un seul compte %{app_name} avec votre identité vérifiée. %{link_html} +duplicate_profiles_detected.intro.link: En savoir plus sur les comptes en double. +duplicate_profiles_detected.intro2: 'Vous devez supprimer les comptes en double avant de vous connecter à %{app_name}. Voici comment faire :' duplicate_profiles_detected.last_sign_in_at_html: ' Last login: %{timestamp_html}' duplicate_profiles_detected.never_logged_in: Never logged in -duplicate_profiles_detected.select_an_account.details: Keep the account that you’ve connected to the most agencies. That way you don’t have to reconnect to all the agencies you use. -duplicate_profiles_detected.select_an_account.heading: Choose an account to keep -duplicate_profiles_detected.sign_back_in.details: Go back to the %{app_name} website and sign in using the one %{app_name} account you kept. -duplicate_profiles_detected.sign_back_in.heading: Sign back into %{app_name} with one account -duplicate_profiles_detected.sign_out: Sign out +duplicate_profiles_detected.select_an_account.details: Conservez le compte que vous utilisez le plus. Par exemple, celui qui est connecté au plus grand nombre de services. Ainsi, vous n’aurez pas à recommencer les démarches pour vous reconnecter à des services. +duplicate_profiles_detected.select_an_account.heading: Choisir le compte que vous voulez conserver +duplicate_profiles_detected.sign_back_in.details: Retournez sur le site web de %{app_name} et connectez-vous à l’aide du compte %{app_name} que vous avez conservé. +duplicate_profiles_detected.sign_back_in.heading: Reconnectez-vous à %{app_name} avec un seul compte +duplicate_profiles_detected.sign_out: Se déconnecter duplicate_profiles_detected.signed_in: Signed In email_address.not_found: Email non trouvé email_addresses.add.duplicate: Cette adresse e-mail est déjà enregistrée sur votre compte. diff --git a/config/locales/zh.yml b/config/locales/zh.yml index c8434264001..82da30af9f6 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -745,26 +745,27 @@ doc_auth.tips.document_capture_selfie_text1: 摘掉任何遮盖您面孔的东 doc_auth.tips.document_capture_selfie_text2: 在光线明亮的地方拍照 doc_auth.tips.document_capture_selfie_text3: 保持中性表情 doc_auth.tips.document_capture_selfie_text4: 确保您整个面孔都可以在绿色圆圈里看到 -duplicate_profiles_detected.accounts_list.heading: Accounts with the same verified information -duplicate_profiles_detected.cant_access: 'I can’t access an account' +duplicate_profiles_detected.accounts_list.heading: 以下账户具有相同的已验证信息 +duplicate_profiles_detected.cant_access: '我无法访问某个帐户' duplicate_profiles_detected.connected_acct_html: ' Connected agencies: %{count}' duplicate_profiles_detected.created_at_html: ' Created: %{timestamp_html}' -duplicate_profiles_detected.delete_duplicates.details_html: Sign in, authenticate, and delete the account from the ‘Your account’ page. %{link_html} -duplicate_profiles_detected.delete_duplicates.heading: 'Delete the duplicate accounts' -duplicate_profiles_detected.delete_duplicates.link: How to delete your account. -duplicate_profiles_detected.dont_recognize_account: I don’t recognize an account above +duplicate_profiles_detected.delete_duplicates.details_html: 登录后,从“你的帐户”页面删除该帐户。 %{link_html} +duplicate_profiles_detected.delete_duplicates.heading: '删除重复帐户' +duplicate_profiles_detected.delete_duplicates.link: 如何删除你的帐户。 +duplicate_profiles_detected.dont_recognize_account: 我不认识上边的一个帐户 duplicate_profiles_detected.duplicate: Duplicate -duplicate_profiles_detected.get_help: Get Help -duplicate_profiles_detected.heading: We found other accounts that may be yours -duplicate_profiles_detected.intro: The %{app_name} requires that you only have one identity verified %{app_name} account. Learn more about duplicate accounts -duplicate_profiles_detected.intro2: 'You need to delete the duplicate accounts before signing into %{app_name}. Here’s what to do:' +duplicate_profiles_detected.get_help: 获取帮助 +duplicate_profiles_detected.heading: 我们发现了其他可能属于你的帐户 +duplicate_profiles_detected.intro_html: '%{app_name} 规定你只能拥有一个身份经过验证的 %{app_name} 帐户。%{link_html}' +duplicate_profiles_detected.intro.link: 了解更多关于重复帐户的信息。 +duplicate_profiles_detected.intro2: '你需要在登录 %{app_name}. 之前删除重复帐户。操作步骤如下:' duplicate_profiles_detected.last_sign_in_at_html: ' Last login: %{timestamp_html}' duplicate_profiles_detected.never_logged_in: Never logged in -duplicate_profiles_detected.select_an_account.details: Keep the account that you’ve connected to the most agencies. That way you don’t have to reconnect to all the agencies you use. -duplicate_profiles_detected.select_an_account.heading: Choose an account to keep -duplicate_profiles_detected.sign_back_in.details: Go back to the %{app_name} website and sign in using the one %{app_name} account you kept. -duplicate_profiles_detected.sign_back_in.heading: Sign back into %{app_name} with one account -duplicate_profiles_detected.sign_out: Sign out +duplicate_profiles_detected.select_an_account.details: 保留你最常用的那个帐户。例如,与最多机构绑定的那个帐户。这样,你就无需再重新连接这些机构。 +duplicate_profiles_detected.select_an_account.heading: 选择要保留的帐户 +duplicate_profiles_detected.sign_back_in.details: 返回 %{app_name} 网站,使用你保留的那个 %{app_name} 帐户登录。 +duplicate_profiles_detected.sign_back_in.heading: 使用一个帐户重新登录 %{app_name} +duplicate_profiles_detected.sign_out: 登出 duplicate_profiles_detected.signed_in: Signed In email_address.not_found: 未找到电子邮件 email_addresses.add.duplicate: 该电邮地址已注册到你的账户。