github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-20 05:45:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Improve account association when account description is missing

Browse Source
This commit is contained in:
David Taylor 2019-07-27 16:37:21 +01:00
parent 1922d4bf78
commit 3324747afe
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
View File

@ -10,9 +10,14 @@
</div>
{{/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}}
<div class="modal-footer">

4
config/locales/client.en.yml
View File

@ -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"