diff options
| author | George Goldberg <george@gberg.me> | 2016-09-21 19:17:48 +0100 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-09-21 15:17:48 -0300 |
| commit | de79343b9aa9dc601e5633cef329e1a83452aa1a (patch) | |
| tree | 5acb88e5bef80fddf3ea89f5a00a183cad118a50 /i18n/en.json | |
| parent | 185387e277aa65781ecb9e5fa710c2a8fb4cee65 (diff) | |
| download | chat-de79343b9aa9dc601e5633cef329e1a83452aa1a.tar.gz chat-de79343b9aa9dc601e5633cef329e1a83452aa1a.tar.bz2 chat-de79343b9aa9dc601e5633cef329e1a83452aa1a.zip | |
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.
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 15c2d773e..14d8f435d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1512,6 +1512,10 @@ "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" }, |