diff options
-rw-r--r-- | webapp/components/admin_console/custom_integrations_settings.jsx | 2 | ||||
-rw-r--r-- | webapp/components/admin_console/server_logs/logs.jsx | 2 | ||||
-rwxr-xr-x | webapp/i18n/en.json | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/custom_integrations_settings.jsx b/webapp/components/admin_console/custom_integrations_settings.jsx index 3b5c51171..e6bcb4b32 100644 --- a/webapp/components/admin_console/custom_integrations_settings.jsx +++ b/webapp/components/admin_console/custom_integrations_settings.jsx @@ -185,7 +185,7 @@ export default class WebhookSettings extends AdminSettings { helpText={ <FormattedHTMLMessage id='admin.service.userAccessTokensDescription' - defaultMessage='When true, users can create <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">user access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create user access tokens, go to the <strong>System Console > Users</strong> page.' + defaultMessage='When true, users can create <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">user access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.' /> } value={this.state.enableUserAccessTokens} diff --git a/webapp/components/admin_console/server_logs/logs.jsx b/webapp/components/admin_console/server_logs/logs.jsx index b60a66ce6..b0d8b38ac 100644 --- a/webapp/components/admin_console/server_logs/logs.jsx +++ b/webapp/components/admin_console/server_logs/logs.jsx @@ -96,7 +96,7 @@ export default class Logs extends React.PureComponent { <div className='banner__content'> <FormattedMessage id='admin.logs.bannerDesc' - defaultMessage='To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.' + defaultMessage='To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.' /> </div> </div> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1eced0e54..7e21b104b 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -587,7 +587,7 @@ "admin.log.locationPlaceholder": "Enter your file location", "admin.log.locationTitle": "File Log Directory:", "admin.log.logSettings": "Log Settings", - "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.", + "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.", "admin.logs.reload": "Reload", "admin.logs.title": "Server Logs", "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.", @@ -844,7 +844,7 @@ "admin.service.useLetsEncrypt": "Use Let's Encrypt:", "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.", "admin.service.userAccessTokensDescLabel": "Name: ", - "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.", + "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.", "admin.service.userAccessTokensIdLabel": "Token ID: ", "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ", "admin.service.webSessionDays": "Session length AD/LDAP and email (days):", |