paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

org settings: Rename "Filter settings" to "Linkifiers".

Browse Source 
Fixes: #10551
This commit is contained in:
Pragati Agrawal
2018-10-01 22:50:28 +05:30
committed by Rishi Gupta
parent 4fa4ca53c2
commit 749e034863
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/settings.js
View File

@@ -18,7 +18,7 @@ var header_map = {
"deactivated-users-admin": i18n.t("Deactivated users"),
"bot-list-admin": i18n.t("Bot list"),
"default-streams-list": i18n.t("Default streams"),
"filter-settings": i18n.t("Filter settings"),
"filter-settings": i18n.t("Linkifiers"),
"invites-list-admin": i18n.t("Invitations"),
"user-groups-admin": i18n.t("User groups"),
"profile-field-settings": i18n.t("Profile field settings"),

4
static/templates/settings/realm-filter-settings-admin.handlebars
View File

@@ -37,7 +37,7 @@
<form class="form-horizontal admin-filter-form">
<div class="add-new-filter-box grey-box">
<div class="new-filter-form wrapper">
<div class="settings-section-title new-filter-section-title">{{t "Add a new filter" }}</div>
<div class="settings-section-title new-filter-section-title">{{t "Add a new linkifier" }}</div>
<div class="alert" id="admin-filter-status"></div>
<div class="control-group">
<label for="filter_pattern" class="control-label">{{t "Regular expression" }}</label>
@@ -50,7 +50,7 @@
<div class="alert" id="admin-filter-format-status"></div>
</div>
<button type="submit" class="button rounded sea-green">
{{t 'Add filter' }}
{{t 'Add linkifier' }}
</button>
</div>
</div>

2
templates/zerver/app/settings_overlay.html
View File

@@ -86,7 +86,7 @@
</li>
<li tabindex="0" data-section="filter-settings">
<i class="icon fa fa-font" aria-hidden="true"></i>
<div class="text">{{ _('Filter settings') }}</div>
<div class="text">{{ _('Linkifiers') }}</div>
</li>
<li tabindex="0" data-section="profile-field-settings">
<i class="icon fa fa-user" aria-hidden="true"></i>

6
templates/zerver/help/add-a-custom-linkification-filter.md
View File

@@ -2,17 +2,17 @@
{!admin-only.md!}
Linkification filters make it easy to refer to issues or tickets in third
Linkifiers make it easy to refer to issues or tickets in third
party issue trackers, like GitHub, Salesforce, Zendesk, and others.
For instance, you can add a filter that automatically turns `#2468`
into a link to `https://github.com/zulip/zulip/issues/2468`.
{settings_tab|filter-settings}
1. Under **Add a new filter**, enter a **Regular expression** and
1. Under **Add a new linkifier**, enter a **Regular expression** and
**URL format string**.
1. Click **Add filter**.
1. Click **Add linkifier**.
!!! tip ""

2
zerver/lib/bugdown/help_settings_links.py
View File

@@ -41,7 +41,7 @@ link_mapping = {
'bot-list-admin': ['Manage organization', 'Bots', '/#organization/bot-list-admin'],
'default-streams-list': ['Manage organization', 'Default streams',
'/#organization/default-streams-list'],
'filter-settings': ['Manage organization', 'Filter settings',
'filter-settings': ['Manage organization', 'Linkifiers',
'/#organization/filter-settings'],
'profile-field-settings': ['Manage organization', 'Custom profile fields',
'/#organization/profile-field-settings'],

2
zerver/webhooks/front/doc.md
View File

@@ -13,7 +13,7 @@ be notified about. Set the URL of the target webhook to the URL
constructed above.
1. Go to the **Settings** page of your Zulip organization. Click on the
**Filter settings** tab, and add a new filter. Set the pattern to
**Linkifiers** tab, and add a new linkifier. Set the pattern to
`cnv_(?P<id>[0-9a-z]+)`. Set the URL format string to
`https://app.frontapp.com/open/cnv_%(id)s`. This step is necessary to map
Front conversations to topics in Zulip.