diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/login/login_controller.jsx | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/login/login_controller.jsx')
-rw-r--r-- | webapp/components/login/login_controller.jsx | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index fa3412f34..4b6757294 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -210,7 +210,7 @@ export default class LoginController extends React.Component { finishSignin(team) { const query = this.props.location.query; - GlobalActions.loadDefaultLocale(); + GlobalActions.loadCurrentLocale(); if (query.redirect_to) { browserHistory.push(query.redirect_to); } else if (team) { @@ -493,12 +493,14 @@ export default class LoginController extends React.Component { key='gitlab' href={Client.getOAuthRoute() + '/gitlab/login' + this.props.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='login.gitlab' - defaultMessage='GitLab' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='login.gitlab' + defaultMessage='GitLab' + /> + </span> </span> </a> ); @@ -511,12 +513,14 @@ export default class LoginController extends React.Component { key='google' href={Client.getOAuthRoute() + '/google/login' + this.props.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='login.google' - defaultMessage='Google Apps' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='login.google' + defaultMessage='Google Apps' + /> + </span> </span> </a> ); @@ -529,12 +533,14 @@ export default class LoginController extends React.Component { key='office365' href={Client.getOAuthRoute() + '/office365/login' + this.props.location.search} > - <span className='icon'/> <span> - <FormattedMessage - id='login.office365' - defaultMessage='Office 365' - /> + <span className='icon'/> + <span> + <FormattedMessage + id='login.office365' + defaultMessage='Office 365' + /> + </span> </span> </a> ); @@ -547,9 +553,11 @@ export default class LoginController extends React.Component { key='saml' href={'/login/sso/saml' + this.props.location.search} > - <span className='icon fa fa-lock fa--margin-top'/> <span> - {global.window.mm_config.SamlLoginButtonText} + <span className='icon fa fa-lock fa--margin-top'/> + <span> + {global.window.mm_config.SamlLoginButtonText} + </span> </span> </a> ); |