diff options
| author | David Lu <david.lu97@outlook.com> | 2017-02-02 07:13:28 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-02-02 10:13:28 -0500 |
| commit | 60be5c902fe30c978d5b30f265509dc28c451407 (patch) | |
| tree | 1d74a67bd48761de20f3fc2462ad08fde5892404 /webapp | |
| parent | 28e445c6e08d0aa931fcf0be0098dfd47aa87eb4 (diff) | |
| download | chat-60be5c902fe30c978d5b30f265509dc28c451407.tar.gz chat-60be5c902fe30c978d5b30f265509dc28c451407.tar.bz2 chat-60be5c902fe30c978d5b30f265509dc28c451407.zip | |
Add link to team URL error (#5270)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/create_team/components/team_url.jsx | 6 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx index cff0002e0..ccf5d63dc 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -78,9 +78,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; @@ -98,7 +98,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}); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index d273e77a3..5d78d44e8 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1219,9 +1219,9 @@ "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>", "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.", "create_team.team_url.required": "This field is required", - "create_team.team_url.taken": "URL is taken or contains a reserved word", + "create_team.team_url.taken": "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.", "create_team.team_url.teamUrl": "Team URL", - "create_team.team_url.unavailable": "This URL is unavailable. Please try another.", + "create_team.team_url.unavailable": "This URL is taken or unavailable. Please try another.", "create_team.team_url.webAddress": "Choose the web address of your new team:", "custom_emoji.empty": "No custom emoji found", "custom_emoji.header": "Custom Emoji", |