diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-08-18 15:02:06 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-18 12:02:06 -0700 |
| commit | 26ec8ffc3edc01fde2189f3465112c88fee5435b (patch) | |
| tree | 53908e19b579931d0307cbf5df567636b8438f9e /webapp/components | |
| parent | f40f41ed536edb76c9873c0cdd5dc8685b0f950f (diff) | |
| download | chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.tar.gz chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.tar.bz2 chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.zip | |
Rename SAML in the System Console to SAML 2.0 + access token string fixes (#7182)
* Update en.json
* Update en.json
* Update admin_sidebar.jsx
* Update saml_settings.jsx
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/admin_console/saml_settings.jsx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 0073a2040..f417cfe56 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -125,7 +125,7 @@ export default class AdminSidebar extends React.Component { title={ <FormattedMessage id='admin.sidebar.saml' - defaultMessage='SAML' + defaultMessage='SAML 2.0' /> } /> diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index 2358660da..98c02e571 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -144,7 +144,7 @@ export default class SamlSettings extends AdminSettings { return ( <FormattedMessage id='admin.authentication.saml' - defaultMessage='SAML' + defaultMessage='SAML 2.0' /> ); } @@ -318,13 +318,13 @@ export default class SamlSettings extends AdminSettings { label={ <FormattedMessage id='admin.saml.enableTitle' - defaultMessage='Enable Login With SAML:' + defaultMessage='Enable Login With SAML 2.0:' /> } helpText={ <FormattedHTMLMessage id='admin.saml.enableDescription' - defaultMessage='When true, Mattermost allows login using SAML. Please see <a href="http://docs.mattermost.com/deployment/sso-saml.html" target="_blank">documentation</a> to learn more about configuring SAML for Mattermost.' + defaultMessage='When true, Mattermost allows login using SAML 2.0. Please see <a href="http://docs.mattermost.com/deployment/sso-saml.html" target="_blank">documentation</a> to learn more about configuring SAML for Mattermost.' /> } value={this.state.enable} |