github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 23:11:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: add instructions to update email when sso_overrides_email is enabled

Browse Source
This commit is contained in:
Arpit Jalan 2019-03-18 16:51:55 +05:30
parent 9dbca41152
commit 0c01cb2cf3
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -41,6 +41,9 @@
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>
{{#if siteSettings.sso_overrides_email}}
{{i18n 'user.email.sso_override_instructions'}}
{{/if}}
{{i18n 'user.email.instructions'}} {{i18n 'user.email.instructions'}}
</div> </div>
{{else}} {{else}}

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

@ -855,7 +855,8 @@ en:
primary: "Primary Email" primary: "Primary Email"
secondary: "Secondary Emails" secondary: "Secondary Emails"
no_secondary: "No secondary emails" no_secondary: "No secondary emails"
instructions: "never shown to the public" sso_override_instructions: "Email can be updated from SSO provider."
instructions: "Never shown to the public."
ok: "We will email you to confirm" ok: "We will email you to confirm"
invalid: "Please enter a valid email address" invalid: "Please enter a valid email address"
authenticated: "Your email has been authenticated by {{provider}}" authenticated: "Your email has been authenticated by {{provider}}"

1
config/site_settings.yml
View File

@ -410,6 +410,7 @@ login:
sso_overrides_email: sso_overrides_email:
default: false default: false
validator: "SsoOverridesEmailValidator" validator: "SsoOverridesEmailValidator"
client: true
sso_overrides_username: false sso_overrides_username: false
sso_overrides_name: false sso_overrides_name: false
sso_overrides_avatar: sso_overrides_avatar: