summaryrefslogtreecommitdiffstats
path: root/webapp/components/create_team
diff options
context:
space:
mode:
authorNick Frazier <nrflaw@gmail.com>2016-11-17 10:17:27 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-11-17 10:17:27 -0500
commitb1db1463f6e858b535d291d3f442eaf8a05bc410 (patch)
tree3bca64444dd5f4dba8fbf6fabf19bf236a4e51ec /webapp/components/create_team
parent091e5b8e03d6e0f107a0f70e1d918b753c52ae20 (diff)
downloadchat-b1db1463f6e858b535d291d3f442eaf8a05bc410.tar.gz
chat-b1db1463f6e858b535d291d3f442eaf8a05bc410.tar.bz2
chat-b1db1463f6e858b535d291d3f442eaf8a05bc410.zip
replaced localizeMessage calls with FormattedMessage components (#4570)
* replaced localizeMessage calls with FormattedMessage components localized file updates * updated localization files * updated localization files
Diffstat (limited to 'webapp/components/create_team')
-rw-r--r--webapp/components/create_team/components/display_name.jsx18
-rw-r--r--webapp/components/create_team/components/team_url.jsx42
2 files changed, 50 insertions, 10 deletions
diff --git a/webapp/components/create_team/components/display_name.jsx b/webapp/components/create_team/components/display_name.jsx
index 50e7b340b..a557a48c5 100644
--- a/webapp/components/create_team/components/display_name.jsx
+++ b/webapp/components/create_team/components/display_name.jsx
@@ -27,10 +27,24 @@ export default class TeamSignupDisplayNamePage extends React.Component {
var displayName = ReactDOM.findDOMNode(this.refs.name).value.trim();
if (!displayName) {
- this.setState({nameError: Utils.localizeMessage('create_team.display_name.required', 'This field is required')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.display_name.required'
+ defaultMessage='This field is required'
+ />)
+ });
return;
} else if (displayName.length < Constants.MIN_TEAMNAME_LENGTH || displayName.length > Constants.MAX_TEAMNAME_LENGTH) {
- this.setState({nameError: Utils.localizeMessage('create_team.display_name.charLength', 'Name must be 2 or more characters up to a maximum of 15')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.display_name.charLength'
+ defaultMessage='Name must be {min} or more characters up to a maximum of {max}'
+ values={{
+ min: Constants.MIN_TEAMNAME_LENGTH,
+ max: Constants.MAX_TEAMNAME_LENGTH
+ }}
+ />)
+ });
return;
}
diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx
index 4bea240da..cff0002e0 100644
--- a/webapp/components/create_team/components/team_url.jsx
+++ b/webapp/components/create_team/components/team_url.jsx
@@ -42,26 +42,47 @@ export default class TeamUrl extends React.Component {
const urlRegex = /^[a-z]+([a-z\-0-9]+|(__)?)[a-z0-9]+$/g;
if (!name) {
- this.setState({nameError: Utils.localizeMessage('create_team.team_url.required', 'This field is required')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.team_url.required'
+ defaultMessage='This field is required'
+ />)
+ });
return;
}
if (cleanedName.length < Constants.MIN_TEAMNAME_LENGTH || cleanedName.length > Constants.MAX_TEAMNAME_LENGTH) {
- this.setState({nameError: Utils.localizeMessage('create_team.team_url.charLength', 'Name must be 4 or more characters up to a maximum of 15')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.team_url.charLength'
+ defaultMessage='Name must be {min} or more characters up to a maximum of {max}'
+ values={{
+ min: Constants.MIN_TEAMNAME_LENGTH,
+ max: Constants.MAX_TEAMNAME_LENGTH
+ }}
+ />)
+ });
return;
}
if (cleanedName !== name || !urlRegex.test(name)) {
- this.setState({nameError: Utils.localizeMessage('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.")});
- return;
- } else if (cleanedName.length < Constants.MIN_TEAMNAME_LENGTH || cleanedName.length > Constants.MAX_TEAMNAME_LENGTH) {
- this.setState({nameError: Utils.localizeMessage('create_team.team_url.charLength', 'Name must be 2 or more characters up to a maximum of 15')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.team_url.regex'
+ defaultMessage="Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash."
+ />)
+ });
return;
}
for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) {
if (cleanedName.indexOf(Constants.RESERVED_TEAM_NAMES[index]) === 0) {
- this.setState({nameError: Utils.localizeMessage('create_team.team_url.taken', 'URL is taken or contains a reserved word')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.team_url.taken'
+ defaultMessage='URL is taken or contains a reserved word'
+ />)
+ });
return;
}
}
@@ -74,7 +95,12 @@ export default class TeamUrl extends React.Component {
checkIfTeamExists(name,
(foundTeam) => {
if (foundTeam) {
- this.setState({nameError: Utils.localizeMessage('create_team.team_url.unavailable', 'This URL is unavailable. Please try another.')});
+ this.setState({nameError: (
+ <FormattedMessage
+ id='create_team.team_url.unavailable'
+ defaultMessage='This URL is unavailable. Please try another.'
+ />)
+ });
this.setState({isLoading: false});
return;
}