summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2016-09-19 13:21:22 +0100
committerJoram Wilander <jwawilander@gmail.com>2016-09-19 08:21:22 -0400
commit8443ca58289055cde25a3cdaaa3987c6f8cfde4a (patch)
treeec957cd1903e76ba5e62eac710777abd74ee0330 /webapp/i18n
parent781ff323db4c70e4ca476f9ef13a04e5aa063585 (diff)
downloadchat-8443ca58289055cde25a3cdaaa3987c6f8cfde4a.tar.gz
chat-8443ca58289055cde25a3cdaaa3987c6f8cfde4a.tar.bz2
chat-8443ca58289055cde25a3cdaaa3987c6f8cfde4a.zip
PLT-1759 - Auto-complete for !channels when posting messages. (#3890)
* Auto-complete for !channels when posting messages. This is part 1 of the fix for PLT-1759 to make channels linkable. Still to do: - Make the !channels clickable when they appear in messages. This is blocked until PR #3865 is resolved as it looks like that refactors some of the code that would be touched by making this change. - Unit tests. Again, I think the above referenced PR should be merged before tackling this. * Fix style problems. * Highlighting of !channel-names in messages. This only identifies the !channel-name (not the display name). The implementation of the auto-complete on channel names now needs to be modified to convert to the channel handle before sending the message. * Display !channel-name as !Display Name. When we encounter !channel-name in a message, display it as a link using the channel's actual name rather than it's handle (name). * Match on names and display name, and use name. * Autocomplete channels matching on both the name and the the display name. * Use the name as the text we fill in instead of the display name. It's potentially a bit ugly, but it minimises complexity for now as otherwise we'd have to do complicated things to the message box. * Fix style issues. * Load more channels everywhere. Whenever we load the list of channels, we should also load the list of more channels. This is to enable auto-completing and auto-linking of all channels whether or not the user is in them currently. * Include more channels in the map for linking. * Listen for channel list updates for autolinking. * Remove accidental console.log. * Autocomplete on more channels too. * i18n for channel autocomplete. * Link directly to channels in !channel mentions. This currently does not work if you aren't a member of that channel. Need to decide what the correct behaviour is in that case. * Fix style issues. * Show channel name and handle in suggestion. * Match channels only at start or after space. * Better matching in text-formatting. Only match channels after a space-type character or at the start in the posts list too. * Move the route construction to make tests work. Moves route-construction out of text_formatting.jsx and into utils.jsx so that the unit tests work once again.
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 74ff88542..91760fb14 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1697,8 +1697,10 @@
"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.channel": "Notifies everyone in the channel",
+ "suggestion.mention.channels": "My Channels",
"suggestion.mention.here": "Notifies everyone in the channel and online",
"suggestion.mention.members": "Channel Members",
+ "suggestion.mention.morechannels": "Other Channels",
"suggestion.mention.nonmembers": "Not in Channel",
"suggestion.mention.special": "Special Mentions",
"suggestion.search.private": "Private Groups",