diff options
author | Corey Hulen <corey@hulen.com> | 2016-02-04 16:51:53 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-02-04 16:51:53 -0800 |
commit | ccfdfdfce2f9b697baf28041193b39bceb3bd5dc (patch) | |
tree | 542f928bafd2d791eaca115c264601b4079a5a04 | |
parent | bab2be98f78792702fd60c16b174dc6ef0b7adf6 (diff) | |
parent | b25e7e227aec41754b790ab60ce3697ac1da0425 (diff) | |
download | chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.tar.gz chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.tar.bz2 chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.zip |
Merge pull request #2079 from mattermost/help-text-updates
Changing URL for testing push notifications
-rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 6 | ||||
-rw-r--r-- | web/static/i18n/en.json | 6 | ||||
-rw-r--r-- | web/static/i18n/es.json | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 435eff036..1d8f9c1dc 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -54,7 +54,7 @@ var holders = defineMessages({ }, pushServerEx: { id: 'admin.email.pushServerEx', - defaultMessage: 'E.g.: "https://push-test.mattermost.com"' + defaultMessage: 'E.g.: "http://push-test.mattermost.com"' }, testing: { id: 'admin.email.testing', @@ -918,7 +918,7 @@ class EmailSettings extends React.Component { <p className='help-text'> <FormattedMessage id='admin.email.pushServerDesc' - defaultMessage='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 https://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.' + defaultMessage='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.' /> </p> </div> @@ -954,4 +954,4 @@ EmailSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(EmailSettings);
\ No newline at end of file +export default injectIntl(EmailSettings); diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 9338cc766..1897988f9 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -127,7 +127,7 @@ "admin.email.connectionSecurityStart": "STARTTLS", "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", - "admin.email.pushServerEx": "E.g.: \"https://push-test.mattermost.com\"", + "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"", "admin.email.testing": "Testing...", "admin.email.saving": "Saving Config...", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", @@ -170,7 +170,7 @@ "admin.email.pushTitle": "Send Push Notifications: ", "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.pushServerTitle": "Push Notification Server:", - "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 https://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.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. To troubleshoot, set Log Settings > File Log Level to DEBUG to log sending of push notifications. Please do not use test service for production deployments.", "admin.email.save": "Save", "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", @@ -326,7 +326,7 @@ "admin.log.fileTitle": "Log To File: ", "admin.log.fileDescription": "Typically set to true in production. When true, log files are written to the log file specified in file location field below.", "admin.log.fileLevelTitle": "File Log Level:", - "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.", + "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues. Also includes push notification and email send events for troubleshooting notifications.", "admin.log.locationTitle": "File Location:", "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.", "admin.log.formatTitle": "File Format:", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 5cd36930c..cae6a0ffd 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -73,8 +73,8 @@ "admin.email.passwordSaltExample": "Ej \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:", "admin.email.pushDesc": "Normalmente se asigna como verdadero en producción. Cuando está en verdadero, Mattermost intenta enviar notificaciones a dispositivos iOS y Android a través del servidor de notificaciones.", - "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.", - "admin.email.pushServerEx": "Ej.: \"https://push-test.mattermost.com\"", + "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar http://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.", + "admin.email.pushServerEx": "Ej.: \"http://push-test.mattermost.com\"", "admin.email.pushServerTitle": "Servidor de Notificaciones:", "admin.email.pushTitle": "Envío de Notificaciones: ", "admin.email.regenerate": "Regenerar", |