From 3324747afe4ac6656803657892b5cc5a242f5e0a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 27 Jul 2019 16:37:21 +0100 Subject: [PATCH] UX: Improve account association when account description is missing --- .../templates/modal/associate-account-confirm.hbs | 11 ++++++++--- config/locales/client.en.yml | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs index 3fec07f02e3..d24c1d7392d 100644 --- a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs +++ b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs @@ -10,9 +10,14 @@ {{/if}} - {{i18n "user.associated_accounts.confirm_description" - provider=(i18n (concat "login." model.provider_name ".name")) - account_description=model.account_description}} + {{#if model.account_description}} + {{i18n "user.associated_accounts.confirm_description.account_specific" + provider=(i18n (concat "login." model.provider_name ".name")) + account_description=model.account_description}} + {{else}} + {{i18n "user.associated_accounts.confirm_description.generic" + provider=(i18n (concat "login." model.provider_name ".name"))}} + {{/if}} {{/d-modal-body}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 4fae27d51e6..431e25ae4c2 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1024,7 +1024,9 @@ en: cancel: "Cancel" not_connected: "(not connected)" confirm_modal_title: "Connect %{provider} Account" - confirm_description: "Your %{provider} account '%{account_description}' will be used for authentication." + confirm_description: + account_specific: "Your %{provider} account '%{account_description}' will be used for authentication." + generic: "Your %{provider} account will be used for authentication." name: title: "Name"