implement fix for PLT-6383 - Add "CAUTION" to @all auto-complete (#6240)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
4e086311ad
Коммит
f5d9010f9a
@@ -4,7 +4,6 @@
|
|||||||
import Suggestion from './suggestion.jsx';
|
import Suggestion from './suggestion.jsx';
|
||||||
import Provider from './provider.jsx';
|
import Provider from './provider.jsx';
|
||||||
|
|
||||||
import ChannelStore from 'stores/channel_store.jsx';
|
|
||||||
import UserStore from 'stores/user_store.jsx';
|
import UserStore from 'stores/user_store.jsx';
|
||||||
|
|
||||||
import {autocompleteUsersInChannel} from 'actions/user_actions.jsx';
|
import {autocompleteUsersInChannel} from 'actions/user_actions.jsx';
|
||||||
@@ -31,10 +30,7 @@ class AtMentionSuggestion extends Suggestion {
|
|||||||
description = (
|
description = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='suggestion.mention.all'
|
id='suggestion.mention.all'
|
||||||
defaultMessage='Notifies everyone in the channel, use in {townsquare} to notify the whole team'
|
defaultMessage='CAUTION: This mentions everyone in channel'
|
||||||
values={{
|
|
||||||
townsquare: ChannelStore.getByName('town-square').display_name
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
icon = <i className='mention__image fa fa-users fa-2x'/>;
|
icon = <i className='mention__image fa fa-users fa-2x'/>;
|
||||||
|
|||||||
@@ -2000,7 +2000,7 @@
|
|||||||
"sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
|
"sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
|
||||||
"sso_signup.teamName": "Enter name of new team",
|
"sso_signup.teamName": "Enter name of new team",
|
||||||
"sso_signup.team_error": "Please enter a team name",
|
"sso_signup.team_error": "Please enter a team name",
|
||||||
"suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
|
"suggestion.mention.all": "CAUTION: This mentions everyone in channel",
|
||||||
"suggestion.mention.channel": "Notifies everyone in the channel",
|
"suggestion.mention.channel": "Notifies everyone in the channel",
|
||||||
"suggestion.mention.channels": "My Channels",
|
"suggestion.mention.channels": "My Channels",
|
||||||
"suggestion.mention.here": "Notifies everyone in the channel and online",
|
"suggestion.mention.here": "Notifies everyone in the channel and online",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user