From 8d7dcf44e2c6951a501c74dca21d453f2f9966e4 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 31 Jul 2017 11:37:54 -0400 Subject: PLT-7235 Fix broken links on System Console Mobile Push settings page (#7047) * Update push_settings.jsx * Update en.json --- webapp/components/admin_console/push_settings.jsx | 8 ++++---- webapp/i18n/en.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/components/admin_console/push_settings.jsx b/webapp/components/admin_console/push_settings.jsx index 3b21f727a..c5aebf69e 100644 --- a/webapp/components/admin_console/push_settings.jsx +++ b/webapp/components/admin_console/push_settings.jsx @@ -120,28 +120,28 @@ export default class PushSettings extends AdminSettings { sendHelpText = ( ); } else if (this.state.pushNotificationServerType === PUSH_NOTIFICATIONS_MHPNS) { pushServerHelpText = ( ); } else if (this.state.pushNotificationServerType === PUSH_NOTIFICATIONS_MTPNS) { pushServerHelpText = ( ); } else { pushServerHelpText = ( ); } diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 19d3771e7..deec452d2 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -262,7 +262,7 @@ "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.", "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ", "admin.email.connectionSecurityTest": "Test Connection", - "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an Enterprise App Store.", + "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an Enterprise App Store.", "admin.email.emailFail": "Connection unsuccessful: {error}", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.", @@ -275,9 +275,9 @@ "admin.email.inviteSaltExample": "E.g.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", "admin.email.inviteSaltTitle": "Email Invite Salt:", "admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps", - "admin.email.mhpnsHelp": "Download Mattermost iOS app from iTunes. Download Mattermost Android app from Google Play. Learn more about HPNS.", + "admin.email.mhpnsHelp": "Download Mattermost iOS app from iTunes. Download Mattermost Android app from Google Play. Learn more about HPNS.", "admin.email.mtpns": "Use iOS and Android apps on iTunes and Google Play with TPNS", - "admin.email.mtpnsHelp": "Download Mattermost iOS app from iTunes. Download Mattermost Android app from Google Play. Learn more about TPNS.", + "admin.email.mtpnsHelp": "Download Mattermost iOS app from iTunes. Download Mattermost Android app from Google Play. Learn more about TPNS.", "admin.email.nofificationOrganizationExample": "E.g.: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"", "admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.", "admin.email.notificationDisplayExample": "E.g.: \"Mattermost Notification\", \"System\", \"No-Reply\"", @@ -297,7 +297,7 @@ "admin.email.pushContentTitle": "Push Notification Contents:", "admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.", "admin.email.pushOff": "Do not send push notifications", - "admin.email.pushOffHelp": "Please see documentation on push notifications to learn more about setup options.", + "admin.email.pushOffHelp": "Please see documentation on push notifications to learn more about setup options.", "admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.", "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"", "admin.email.pushServerTitle": "Push Notification Server:", -- cgit v1.2.3-1-g7c22