diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 11:57:49 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 11:57:49 -0700 |
commit | 5b546450a0d85a9f05507fdfe1265e2f13422a23 (patch) | |
tree | 0cf8da7c58b06c0482a7fc2e769f1e7555f53993 | |
parent | f99ad06c19379a9279af0c260d9daceefc7fe944 (diff) | |
parent | 11e7b56e7818a1b82470ce4fd37baa1a7aaeaf20 (diff) | |
download | chat-5b546450a0d85a9f05507fdfe1265e2f13422a23.tar.gz chat-5b546450a0d85a9f05507fdfe1265e2f13422a23.tar.bz2 chat-5b546450a0d85a9f05507fdfe1265e2f13422a23.zip |
Merge pull request #7 from mattermost/master
to me
-rw-r--r-- | web/react/components/login.jsx | 6 | ||||
-rw-r--r-- | web/static/config/config.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 103a93bc6..65f1da1f8 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({ <div> <span className="signup-team__name">{ config.SiteName }</span> <br/> - <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span> + <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span> <br/> <br/> </div> <form onSubmit={this.handleSubmit}> <div className={server_error ? 'form-group has-error' : 'form-group'}> { server_error } - <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" /> + <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" /> </div> <div className="form-group"> <button type="submit" className="btn btn-primary">Continue</button> </div> <div> - <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span> + <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span> </div> <br/> <br/> diff --git a/web/static/config/config.js b/web/static/config/config.js index 5a12942c8..82d4bbf70 100644 --- a/web/static/config/config.js +++ b/web/static/config/config.js @@ -35,4 +35,4 @@ var strings = { TeamPlural: "teams", Company: "company", CompanyPlural: "companies" -} +}; |