implement fix for PLT-6383 - Add "CAUTION" to @all auto-complete (#6240)

Этот коммит содержится в:
Carlos Tadeu Panato Junior
2017-04-27 15:27:31 +02:00
коммит произвёл Joram Wilander
родитель 4e086311ad
Коммит f5d9010f9a
2 изменённых файлов: 2 добавлений и 6 удалений

Просмотреть файл

@@ -4,7 +4,6 @@
import Suggestion from './suggestion.jsx';
import Provider from './provider.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {autocompleteUsersInChannel} from 'actions/user_actions.jsx';
@@ -31,10 +30,7 @@ class AtMentionSuggestion extends Suggestion {
description = (
<FormattedMessage
id='suggestion.mention.all'
defaultMessage='Notifies everyone in the channel, use in {townsquare} to notify the whole team'
values={{
townsquare: ChannelStore.getByName('town-square').display_name
}}
defaultMessage='CAUTION: This mentions everyone in channel'
/>
);
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.teamName": "Enter name of new team",
"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.channels": "My Channels",
"suggestion.mention.here": "Notifies everyone in the channel and online",