diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-04-18 11:26:10 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-04-18 08:26:10 -0700 |
| commit | b1c47922ed84be4d5d1e41d90d7220570c6218ce (patch) | |
| tree | d66d1d7d895ceb4ffb2426a37f0c60449bb09ab4 | |
| parent | c10517188dccfd400a33e3e8d401ea7af7ec401f (diff) | |
| download | chat-b1c47922ed84be4d5d1e41d90d7220570c6218ce.tar.gz chat-b1c47922ed84be4d5d1e41d90d7220570c6218ce.tar.bz2 chat-b1c47922ed84be4d5d1e41d90d7220570c6218ce.zip | |
GH-5847 Add missing localization string (#6130)
* Add missing localization string to channel_intro_messages.jsx
* Update en.json
* Fix indentation
| -rwxr-xr-x | webapp/i18n/en.json | 1 | ||||
| -rw-r--r-- | webapp/utils/channel_intro_messages.jsx | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index b92d37e0a..9fa2ee7a2 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1542,6 +1542,7 @@ "integrations.outgoingWebhook.description": "Outgoing webhooks allow external integrations to receive and respond to messages", "integrations.outgoingWebhook.title": "Outgoing Webhook", "integrations.successful": "Setup Successful", + "intro_messages.channel": "channel", "intro_messages.DM": "This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.", "intro_messages.anyMember": " Any member can join and read this channel.", "intro_messages.beginning": "Beginning of {name}", diff --git a/webapp/utils/channel_intro_messages.jsx b/webapp/utils/channel_intro_messages.jsx index b75474eb0..64d250943 100644 --- a/webapp/utils/channel_intro_messages.jsx +++ b/webapp/utils/channel_intro_messages.jsx @@ -150,6 +150,13 @@ export function createDMIntroMessage(channel, centeredIntro) { } export function createOffTopicIntroMessage(channel, centeredIntro) { + var uiType = ( + <FormattedMessage + id='intro_messages.channel' + defaultMessage='channel' + /> + ); + return ( <div className={'channel-intro ' + centeredIntro}> <FormattedHTMLMessage @@ -159,7 +166,7 @@ export function createOffTopicIntroMessage(channel, centeredIntro) { display_name: channel.display_name }} /> - {createInviteChannelMemberButton(channel, 'channel')} + {createInviteChannelMemberButton(channel, uiType)} {createSetHeaderButton(channel)} </div> ); |