diff --git a/app/components/channel_intro/channel_intro.js b/app/components/channel_intro/channel_intro.js index b852ccbe0..d3111f54a 100644 --- a/app/components/channel_intro/channel_intro.js +++ b/app/components/channel_intro/channel_intro.js @@ -162,29 +162,21 @@ class ChannelIntro extends PureComponent { if (creator) { const creatorName = this.getDisplayName(creator); mainMessageIntl = { - id: 'intro_messages.creator', - defaultMessage: 'This is the start of the {name} {type}, created by {creator} on {date}.', + id: t('intro_messages.creator'), + defaultMessage: 'This is the start of the {name} channel, created by {creator} on {date}.', values: { name: currentChannel.display_name, creator: creatorName, date, - type: intl.formatMessage({ - id: 'intro_messages.channel', - defaultMessage: 'channel', - }), }, }; } else { mainMessageIntl = { id: t('intro_messages.noCreator'), - defaultMessage: 'This is the start of the {name} {type}, created on {date}.', + defaultMessage: 'This is the start of the {name} channel, created on {date}.', values: { name: currentChannel.display_name, date, - type: intl.formatMessage({ - id: 'intro_messages.channel', - defaultMessage: 'channel', - }), }, }; } @@ -228,16 +220,12 @@ class ChannelIntro extends PureComponent { }); const mainMessage = intl.formatMessage({ - id: 'intro_messages.creator', - defaultMessage: 'This is the start of the {name} {type}, created by {creator} on {date}.', + id: 'intro_messages.creatorPrivate', + defaultMessage: 'This is the start of the {name} private channel, created by {creator} on {date}.', }, { name: currentChannel.display_name, creator: creatorName, date, - type: intl.formatMessage({ - id: 'intro_messages.group', - defaultMessage: 'private channel', - }), }); const onlyInvitedMessage = intl.formatMessage({ diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index 3d1f6e31b..40ea8508f 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -80,11 +80,10 @@ "integrations.add": "Add", "intro_messages.anyMember": " Any member can join and read this channel.", "intro_messages.beginning": "Beginning of {name}", - "intro_messages.channel": "channel", - "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.", - "intro_messages.group": "private channel", + "intro_messages.creator": "This is the start of the {name} channel, created by {creator} on {date}.", + "intro_messages.creatorPrivate": "This is the start of the {name} private channel, created by {creator} on {date}.", "intro_messages.group_message": "This is the start of your group message history with these teammates. Messages and files shared here are not shown to people outside this area.", - "intro_messages.noCreator": "This is the start of the {name} {type}, created on {date}.", + "intro_messages.noCreator": "This is the start of the {name} channel, created on {date}.", "intro_messages.onlyInvited": " Only invited members can see this private channel.", "last_users_message.added_to_channel.type": "were **added to the channel** by {actor}.", "last_users_message.added_to_team.type": "were **added to the team** by {actor}.",