summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-17 10:31:33 -0800
committerCorey Hulen <corey@hulen.com>2015-06-17 10:31:33 -0800
commit11e7b56e7818a1b82470ce4fd37baa1a7aaeaf20 (patch)
tree0cf8da7c58b06c0482a7fc2e769f1e7555f53993
parent8265b32b8bd0ccd7929c018eb162f5f059dd13d7 (diff)
parentbf3ca45dac4b56d06394dd3ceb1cece61a10f1ae (diff)
downloadchat-11e7b56e7818a1b82470ce4fd37baa1a7aaeaf20.tar.gz
chat-11e7b56e7818a1b82470ce4fd37baa1a7aaeaf20.tar.bz2
chat-11e7b56e7818a1b82470ce4fd37baa1a7aaeaf20.zip
Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
-rw-r--r--web/react/components/login.jsx6
-rw-r--r--web/static/config/config.js2
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"
-}
+};