Skip to content

[stable19] Clarify that the email is always shared within the instance #21521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jun 22, 2020
+2 −2
Merged

[stable19] Clarify that the email is always shared within the instance #21521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Clarify that the email is always shared within the instance 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Jun 22, 2020
commit 127cfeee90fe28b192c5e5cc0b3bfb6cd355e649
4 changes: 2 additions & 2 deletions apps/settings/js/federationscopemenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
this._scopes = [
{
name: 'private',
displayName: (this.field === 'avatar' || this.field === 'displayname') ? t('settings', 'Local') : t('settings', 'Private'),
tooltip: (this.field === 'avatar' || this.field === 'displayname') ? t('settings', 'Only visible to local users') : t('settings', 'Only visible to you'),
displayName: (this.field === 'avatar' || this.field === 'displayname' || this.field === 'email') ? t('settings', 'Local') : t('settings', 'Private'),
tooltip: (this.field === 'avatar' || this.field === 'displayname' || this.field === 'email') ? t('settings', 'Only visible to local users') : t('settings', 'Only visible to you'),
iconClass: 'icon-password',
active: false
},
Expand Down