IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add link to team URL error (#5270)

Browse Source
This commit is contained in:
David Lu
2017-02-02 07:13:28 -08:00
committed by Corey Hulen
parent 28e445c6e0
commit 60be5c902f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/create_team/components/team_url.jsx
View File

@@ -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});

4
webapp/i18n/en.json
View File

@@ -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",