diff options
| author | David Lu <david.lu97@outlook.com> | 2017-02-13 05:15:04 -0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-02-13 08:15:04 -0500 |
| commit | fac85b676eafb20b5f70db1805006d64889606ff (patch) | |
| tree | a30a374cace52ec68757151cc31ecb0c0ef5b217 | |
| parent | d05525e2164017da87cb119f85e9abfbd7db32f3 (diff) | |
| download | chat-fac85b676eafb20b5f70db1805006d64889606ff.tar.gz chat-fac85b676eafb20b5f70db1805006d64889606ff.tar.bz2 chat-fac85b676eafb20b5f70db1805006d64889606ff.zip | |
Revert "PLT-5281 Add link to team URL error" (#5372)
| -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 4a063d145..2ab143d7f 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -77,9 +77,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: ( - <FormattedHTMLMessage + <FormattedMessage id='create_team.team_url.taken' - 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.' + defaultMessage='URL is taken or contains a reserved word' />) }); return; @@ -97,7 +97,7 @@ export default class TeamUrl extends React.Component { this.setState({nameError: ( <FormattedMessage id='create_team.team_url.unavailable' - defaultMessage='This URL is taken or unavailable. Please try another.' + defaultMessage='This URL is unavailable. Please try another.' />) }); this.setState({isLoading: false}); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 5d78d44e8..d273e77a3 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": "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.taken": "URL is taken or contains a reserved word", "create_team.team_url.teamUrl": "Team URL", - "create_team.team_url.unavailable": "This URL is taken or unavailable. Please try another.", + "create_team.team_url.unavailable": "This URL is 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", |