From de79343b9aa9dc601e5633cef329e1a83452aa1a Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Wed, 21 Sep 2016 19:17:48 +0100 Subject: Fix !channel linking in Slack import. (#4065) Original version of the patch didn't take into account that, like with @mentions, there's an "old" and a "new" format in the Slack export files for channel mentions. This version imports both correctly. --- i18n/en.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 15c2d773e..14d8f435d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1511,6 +1511,10 @@ "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn", "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}" }, + { + "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn", + "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}" + }, { "id": "api.slackimport.slack_import.log", "translation": "Mattermost Slack Import Log\r\n" -- cgit v1.2.3-1-g7c22