paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 07:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream-settings: Add info to can_remove_subscribers_group label.

Browse Source 
Mention that admins can unsubscribe others from any channel
in the setting label.
This commit is contained in:
Sahil Batra
2024-11-21 17:32:50 +05:30
committed by Tim Abbott
parent d1e76a9281
commit 90ae342af2
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/capitalization.py
View File

@@ -175,6 +175,8 @@ IGNORED_PHRASES = [
r"hours", r"hours",
r"days", r"days",
r"weeks", r"weeks",
# Used in "Who can unsubscribe others from this channel" label.
r"in addition to organization administrators",
] ]
# Sort regexes in descending order of their lengths. As a result, the # Sort regexes in descending order of their lengths. As a result, the

5
web/templates/settings/group_setting_value_pill_input.hbs
View File

@@ -1,5 +1,8 @@
<div class="input-group"> <div class="input-group">
<label class="group-setting-label">{{label}}</label> <label class="group-setting-label">
{{label}}
{{#if label_parens_text}}(<i>{{label_parens_text}}</i>){{/if}}
</label>
<div class="pill-container person_picker prop-element" id="{{#if prefix}}{{prefix}}{{else}}id_{{/if}}{{setting_name}}" data-setting-widget-type="group-setting-type"> <div class="pill-container person_picker prop-element" id="{{#if prefix}}{{prefix}}{{else}}id_{{/if}}{{setting_name}}" data-setting-widget-type="group-setting-type">
<div class="input" contenteditable="true" data-placeholder="{{t 'Add roles, groups or users' }}"> <div class="input" contenteditable="true" data-placeholder="{{t 'Add roles, groups or users' }}">
{{~! Squash whitespace so that placeholder is displayed when empty. ~}} {{~! Squash whitespace so that placeholder is displayed when empty. ~}}

1
web/templates/stream_settings/stream_types.hbs
View File

@@ -69,6 +69,7 @@
{{> ../settings/group_setting_value_pill_input {{> ../settings/group_setting_value_pill_input
setting_name="can_remove_subscribers_group" setting_name="can_remove_subscribers_group"
label=(t 'Who can unsubscribe others from this channel') label=(t 'Who can unsubscribe others from this channel')
label_parens_text=(t 'in addition to organization administrators')
prefix=prefix }} prefix=prefix }}
{{#if (or is_owner is_stream_edit)}} {{#if (or is_owner is_stream_edit)}}