summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-07-06 12:04:40 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-06 12:04:40 -0400
commitf44dc649a933ac52a3dfc0640403235668ae5cd1 (patch)
treee5354b8e851b8c0f0bf15de9843eb05c460dc3b0 /webapp
parentda0747ac7a3c8d3ef8eb2620f52fe5d1fd355a12 (diff)
downloadchat-f44dc649a933ac52a3dfc0640403235668ae5cd1.tar.gz
chat-f44dc649a933ac52a3dfc0640403235668ae5cd1.tar.bz2
chat-f44dc649a933ac52a3dfc0640403235668ae5cd1.zip
updated text in select team (#3478)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/select_team/select_team.jsx12
-rw-r--r--webapp/i18n/en.json9
2 files changed, 11 insertions, 10 deletions
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index e013a56c6..f7d5b14b0 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -108,7 +108,7 @@ export default class SelectTeam extends React.Component {
<div>
<FormattedMessage
id='signup_team.no_open_teams_canCreate'
- defaultMessage='No open teams have been created. Please ask your administrator for an invite or create a new team.'
+ defaultMessage='No teams are available to join. Please create a new team or ask your administrator for an invite.'
/>
</div>
</div>
@@ -119,7 +119,7 @@ export default class SelectTeam extends React.Component {
<div>
<FormattedMessage
id='signup_team.no_open_teams'
- defaultMessage='No open teams have been created. Please ask your administrator for an invite.'
+ defaultMessage='No teams are available to join. Please ask your administrator for an invite.'
/>
</div>
</div>
@@ -134,7 +134,7 @@ export default class SelectTeam extends React.Component {
<h4>
<FormattedMessage
id='signup_team.choose'
- defaultMessage='Teams you are a member of:'
+ defaultMessage='Your teams:'
/>
</h4>
<div className='signup-team-all'>
@@ -151,7 +151,7 @@ export default class SelectTeam extends React.Component {
<h4>
<FormattedMessage
id='signup_team.join_open'
- defaultMessage='Open teams you can join: '
+ defaultMessage='Teams you can join: '
/>
</h4>
<div className='signup-team-all'>
@@ -204,8 +204,8 @@ export default class SelectTeam extends React.Component {
className='signup-team-login'
>
<FormattedMessage
- id='navbar_dropdown.console'
- defaultMessage='System Console'
+ id='signup_team_system_console'
+ defaultMessage='Go to System Console'
/>
</Link>
</div>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 34dbc4996..464b321c7 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1332,19 +1332,20 @@
"sidebar_right_menu.switch_team": "Team Selection",
"sidebar_right_menu.teamLink": "Get Team Invite Link",
"sidebar_right_menu.teamSettings": "Team Settings",
- "signup_team.choose": "Teams you are a member of: ",
+ "signup_team.choose": "Your teams: ",
"signup_team.createTeam": "Or Create a Team",
"signup_team.disabled": "Team creation has been disabled. Please contact an administrator for access.",
- "signup_team.join_open": "Open teams you can join: ",
+ "signup_team.join_open": "Teams you can join: ",
"signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.",
- "signup_team.no_open_teams": "No open teams have been created. Please ask your administrator for an invite.",
- "signup_team.no_open_teams_canCreate": "No open teams have been created. Please ask your administrator for an invite or create a new team.",
"signup_team.no_teams": "No teams have been created. Please contact your administrator.",
"signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
+ "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
+ "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
"signup_team.none": "No team creation method has been enabled. Please contact an administrator for access.",
"signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.",
"signup_team_confirm.checkEmail": "Please check your email: <strong>{email}</strong><br />Your email contains a link to set up your team",
"signup_team_confirm.title": "Sign up Complete",
+ "signup_team_system_console": "Go to System Console",
"signup_user_completed.choosePwd": "Choose your password",
"signup_user_completed.chooseUser": "Choose your username",
"signup_user_completed.create": "Create Account",