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

UX: show flair help text for private member visibility only (#14005)

Browse Source
This commit is contained in:
Arpit Jalan
2021-08-11 11:53:58 +05:30
committed by GitHub
parent e157925308
commit e9b2415e7d
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
View File

@ -99,13 +99,9 @@ export default Component.extend({
}, },
@discourseComputed("membersVisibilityLevel") @discourseComputed("membersVisibilityLevel")
membersVisibilityLevelsDescription(membersVisibilityLevel) { membersVisibilityPrivate(membersVisibilityLevel) {
if ( return (
membersVisibilityLevel === this.visibilityLevelOptions.firstObject.value membersVisibilityLevel !== this.visibilityLevelOptions.firstObject.value
) { );
return "admin.groups.manage.interaction.members_visibility_levels.description";
} else {
return "admin.groups.manage.interaction.members_visibility_levels.description_flair_visible";
}
}, },
}); });

8
app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
View File

@ -29,9 +29,11 @@
onChange=(action (mut model.members_visibility_level)) onChange=(action (mut model.members_visibility_level))
}} }}
<div class="control-instructions"> {{#if membersVisibilityPrivate}}
{{i18n membersVisibilityLevelsDescription}} <div class="control-instructions">
</div> {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
</div>
{{/if}}
</div> </div>
{{/if}} {{/if}}

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

@ -3928,8 +3928,7 @@ en:
description: "Admins can see all groups." description: "Admins can see all groups."
members_visibility_levels: members_visibility_levels:
title: "Who can see this group's members?" title: "Who can see this group's members?"
description: "Admins can see members of all groups." description: "Admins can see members of all groups. Flair is visible to all users."
description_flair_visible: "Admins can see members of all groups. Flair is visible to all users."
publish_read_state: "On group messages publish group read state" publish_read_state: "On group messages publish group read state"
membership: membership: