summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorAri Autio <ari.autio@iki.fi>2017-03-24 23:10:40 +0200
committerJoram Wilander <jwawilander@gmail.com>2017-03-24 17:10:40 -0400
commit9cfa7331785181c4ce80b6c45b6bb8b2df6f8dc3 (patch)
tree1ed12c5b17d49b3443fcbdea97b7c2542bd53195 /webapp/components
parent4dc03613b41b1e8a3cad77582fd4d80c6bf401f4 (diff)
downloadchat-9cfa7331785181c4ce80b6c45b6bb8b2df6f8dc3.tar.gz
chat-9cfa7331785181c4ce80b6c45b6bb8b2df6f8dc3.tar.bz2
chat-9cfa7331785181c4ce80b6c45b6bb8b2df6f8dc3.zip
PLT-5281 error messages contain a link to documentation about reserved words (#5530)
* PLT-5281 error messages contain a link to documentation about reserved words * Updated comments per PM review * Proposed fix to review comments
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/create_team/components/team_url.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx
index c8a60cdf9..07fd36f76 100644
--- a/webapp/components/create_team/components/team_url.jsx
+++ b/webapp/components/create_team/components/team_url.jsx
@@ -81,9 +81,9 @@ export default class TeamUrl extends React.Component {
for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) {
if (cleanedName.indexOf(Constants.RESERVED_TEAM_NAMES[index]) === 0) {
this.setState({nameError: (
- <FormattedMessage
+ <FormattedHTMLMessage
id='create_team.team_url.taken'
- defaultMessage='URL is taken or contains a reserved word'
+ defaultMessage='This URL <a href="https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url" target="_blank">starts with a reserved word</a> or is unavailable. Please try another.'
/>)
});
return;
@@ -101,7 +101,7 @@ export default class TeamUrl extends React.Component {
this.setState({nameError: (
<FormattedMessage
id='create_team.team_url.unavailable'
- defaultMessage='This URL is unavailable. Please try another.'
+ defaultMessage='This URL is taken or unavailable. Please try another.'
/>)
});
this.setState({isLoading: false});