From 0157e613bdadaea6b0e0b9db7e8e3000282f09f4 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Tue, 20 Sep 2016 00:00:07 -0400 Subject: Add a link to OAuth 2 docs in help texts (#4034) * Update installed_oauth_apps.jsx * Update custom_integrations_settings.jsx * Update confirm_integration.jsx * Update installed_oauth_apps.jsx * Update en.json * Change FormattedMessage to FormattedHTMLMessage * Fix proper coding of links in en.json * Update en.json --- webapp/i18n/en.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 91760fb14..734be8c7d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -101,7 +101,7 @@ "add_oauth_app.clientSecret": "Client Secret: {secret}", "add_oauth_app.description.help": "Description for your OAuth 2.0 application.", "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.", - "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.", + "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application (see documentation for further details).", "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).", "add_oauth_app.header": "Add", "add_oauth_app.homepage.help": "The URL for the homepage of the OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", @@ -500,7 +500,7 @@ "admin.oauth.google": "Google Apps", "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider", "admin.oauth.office365": "Office 365 (Beta)", - "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.", + "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See documentation to learn more.", "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.oauth.select": "Select OAuth 2.0 service provider:", "admin.office365.EnableHtmlDesc": "
  1. Log in to your Microsoft or Office 365 account. Make sure it's the account on the same tenant that you would like users to log in with.
  2. Go to https://apps.dev.microsoft.com, click Go to app list > Add an app and use \"Mattermost - your-company-name\" as the Application Name.
  3. Under Application Secrets, click Generate New Password and paste it to the Application Secret Password field below.
  4. Under Platforms, click Add Platform, choose Web and enter your-mattermost-url/signup/office365/complete (example: http://localhost:8065/signup/office365/complete) under Redirect URIs. Also uncheck Allow Implicit Flow.
  5. Finally, click Save and then paste the Application ID below.
", @@ -1363,7 +1363,8 @@ "installed_oauth_apps.description": "Description", "installed_oauth_apps.empty": "No OAuth 2.0 Applications found", "installed_oauth_apps.header": "OAuth 2.0 Applications", - "installed_oauth_apps.help": "OAuth 2.0 Applications are available to everyone on your server.", + "installed_oauth_apps.help": "Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.", + "installed_oauth_apps.helpLink": "documentation", "installed_oauth_apps.homepage": "Homepage", "installed_oauth_apps.iconUrl": "Icon URL", "installed_oauth_apps.is_trusted": "Is Trusted: {isTrusted}", -- cgit v1.2.3-1-g7c22