diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx index 3ec067ea9fff..7e306fe36b2d 100644 --- a/components/admin_console/admin_definition.jsx +++ b/components/admin_console/admin_definition.jsx @@ -116,7 +116,7 @@ export default { help_text: 'admin.service.siteURLDescription', help_text_default: 'The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://mattermost.example.com:8065. This setting is required.', placeholder: 'admin.service.siteURLExample', - placeholder_default: 'Ex "https://mattermost.example.com:1234"', + placeholder_default: 'E.g.: "https://mattermost.example.com:1234"', }, { type: Constants.SettingsTypes.TYPE_TEXT, @@ -124,7 +124,7 @@ export default { label: 'admin.service.listenAddress', label_default: 'Listen Address:', placeholder: 'admin.service.listenExample', - placeholder_default: 'Ex ":8065"', + placeholder_default: 'E.g.: ":8065"', help_text: 'admin.service.listenDescription', help_text_default: 'The address and port to which to bind and listen. Specifying ":8065" will bind to all network interfaces. Specifying "127.0.0.1:8065" will only bind to the network interface having that IP address. If you choose a port of a lower level (called "system ports" or "well-known ports", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: "sudo setcap cap_net_bind_service=+ep ./bin/platform" to allow Mattermost to bind to well-known ports.', }, @@ -351,7 +351,7 @@ export default { label: 'admin.team.maxUsersTitle', label_default: 'Max Users Per Team:', placeholder: 'admin.team.maxUsersExample', - placeholder_default: 'Ex "25"', + placeholder_default: 'E.g.: "25"', help_text: 'admin.team.maxUsersDescription', help_text_default: 'Maximum total number of users per team, including both active and inactive users.', }, @@ -361,7 +361,7 @@ export default { label: 'admin.team.maxChannelsTitle', label_default: 'Max Channels Per Team:', placeholder: 'admin.team.maxChannelsExample', - placeholder_default: 'Ex "100"', + placeholder_default: 'E.g.: "100"', help_text: 'admin.team.maxChannelsDescription', help_text_default: 'Maximum total number of channels per team, including both active and deleted channels.', }, @@ -371,7 +371,7 @@ export default { label: 'admin.team.maxNotificationsPerChannelTitle', label_default: 'Max Notifications Per Channel:', placeholder: 'admin.team.maxNotificationsPerChannelExample', - placeholder_default: 'Ex "1000"', + placeholder_default: 'E.g.: "1000"', help_text: 'admin.team.maxNotificationsPerChannelDescription', help_text_default: 'Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.', }, @@ -495,7 +495,7 @@ export default { help_text: 'admin.compliance.directoryDescription', help_text_default: 'Directory to which compliance reports are written. If blank, will be set to ./data/.', placeholder: 'admin.sql.maxOpenExample', - placeholder_default: 'Ex "10"', + placeholder_default: 'E.g.: "10"', needs: [['Enable', true]], needs_license: true, }, diff --git a/components/admin_console/cluster_settings.jsx b/components/admin_console/cluster_settings.jsx index 53ae4ee19758..5ed386b2c52e 100644 --- a/components/admin_console/cluster_settings.jsx +++ b/components/admin_console/cluster_settings.jsx @@ -150,7 +150,7 @@ export default class ClusterSettings extends AdminSettings { defaultMessage='Cluster Name:' /> } - placeholder={Utils.localizeMessage('admin.cluster.ClusterNameEx', 'Ex "Production" or "Staging"')} + placeholder={Utils.localizeMessage('admin.cluster.ClusterNameEx', 'E.g.: "Production" or "Staging"')} helpText={ } - placeholder={Utils.localizeMessage('admin.cluster.OverrideHostnameEx', 'Ex "app-server-01"')} + placeholder={Utils.localizeMessage('admin.cluster.OverrideHostnameEx', 'E.g.: "app-server-01"')} helpText={ } - placeholder={Utils.localizeMessage('admin.cluster.GossipPortEx', 'Ex "8074"')} + placeholder={Utils.localizeMessage('admin.cluster.GossipPortEx', 'E.g.: "8074"')} helpText={ } value={this.state.GossipPort} @@ -255,7 +255,7 @@ export default class ClusterSettings extends AdminSettings { defaultMessage='Streaming Port:' /> } - placeholder={Utils.localizeMessage('admin.cluster.StreamingPortEx', 'Ex "8075"')} + placeholder={Utils.localizeMessage('admin.cluster.StreamingPortEx', 'E.g.: "8075"')} helpText={ } maxLength={Constants.MAX_SITENAME_LENGTH} - placeholder={Utils.localizeMessage('admin.team.siteNameExample', 'Ex "Mattermost"')} + placeholder={Utils.localizeMessage('admin.team.siteNameExample', 'E.g.: "Mattermost"')} helpText={ } - placeholder={Utils.localizeMessage('admin.sql.maxConnectionsExample', 'Ex "10"')} + placeholder={Utils.localizeMessage('admin.sql.maxConnectionsExample', 'E.g.: "10"')} helpText={ } - placeholder={Utils.localizeMessage('admin.sql.maxOpenExample', 'Ex "10"')} + placeholder={Utils.localizeMessage('admin.sql.maxOpenExample', 'E.g.: "10"')} helpText={ } - placeholder={Utils.localizeMessage('admin.sql.queryTimeoutExample', 'Ex "30"')} + placeholder={Utils.localizeMessage('admin.sql.queryTimeoutExample', 'E.g.: "30"')} helpText={ } - placeholder={Utils.localizeMessage('admin.sql.keyExample', 'Ex "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"')} + placeholder={Utils.localizeMessage('admin.sql.keyExample', 'E.g.: "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.googleExample', 'Ex "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"')} + placeholder={Utils.localizeMessage('admin.service.googleExample', 'E.g.: "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"')} helpText={ } - placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ } - placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.serverEx', 'Ex "10.0.0.23"')} + placeholder={Utils.localizeMessage('admin.ldap.serverEx', 'E.g.: "10.0.0.23"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.portEx', 'Ex "389"')} + placeholder={Utils.localizeMessage('admin.ldap.portEx', 'E.g.: "389"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.baseEx', 'Ex "ou=Unit Name,dc=corp,dc=example,dc=com"')} + placeholder={Utils.localizeMessage('admin.ldap.baseEx', 'E.g.: "ou=Unit Name,dc=corp,dc=example,dc=com"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.firstnameAttrEx', 'Ex "givenName"')} + placeholder={Utils.localizeMessage('admin.ldap.firstnameAttrEx', 'E.g.: "givenName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.lastnameAttrEx', 'Ex "sn"')} + placeholder={Utils.localizeMessage('admin.ldap.lastnameAttrEx', 'E.g.: "sn"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.nicknameAttrEx', 'Ex "nickname"')} + placeholder={Utils.localizeMessage('admin.ldap.nicknameAttrEx', 'E.g.: "nickname"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.emailAttrEx', 'Ex "mail" or "userPrincipalName"')} + placeholder={Utils.localizeMessage('admin.ldap.emailAttrEx', 'E.g.: "mail" or "userPrincipalName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.usernameAttrEx', 'Ex "sAMAccountName"')} + placeholder={Utils.localizeMessage('admin.ldap.usernameAttrEx', 'E.g.: "sAMAccountName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'Ex "sAMAccountName"')} + placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'E.g.: "sAMAccountName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "AD/LDAP Username"')} + placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'E.g.: "AD/LDAP Username"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'Ex "2000"')} + placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'E.g.: "2000"')} helpText={ } - placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'Ex "60"')} + placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'E.g.: "60"')} helpText={ } - placeholder={Utils.localizeMessage('admin.metrics.listenAddressEx', 'Ex ":8067"')} + placeholder={Utils.localizeMessage('admin.metrics.listenAddressEx', 'E.g.: ":8067"')} helpText={ } - placeholder={Utils.localizeMessage('admin.google.clientIdExample', 'Ex "7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com"')} + placeholder={Utils.localizeMessage('admin.google.clientIdExample', 'E.g.: "7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com"')} helpText={ } - placeholder={Utils.localizeMessage('admin.google.clientSecretExample', 'Ex "H8sz0Az-dDs2p15-7QzD231"')} + placeholder={Utils.localizeMessage('admin.google.clientSecretExample', 'E.g.: "H8sz0Az-dDs2p15-7QzD231"')} helpText={ } - placeholder={Utils.localizeMessage('admin.office365.clientIdExample', 'Ex "adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq"')} + placeholder={Utils.localizeMessage('admin.office365.clientIdExample', 'E.g.: "adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq"')} helpText={ } - placeholder={Utils.localizeMessage('admin.office365.clientSecretExample', 'Ex "shAieM47sNBfgl20f8ci294"')} + placeholder={Utils.localizeMessage('admin.office365.clientSecretExample', 'E.g.: "shAieM47sNBfgl20f8ci294"')} helpText={ } - placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ } - placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ } - placeholder={Utils.localizeMessage('admin.password.minimumLengthExample', 'Ex "5"')} + placeholder={Utils.localizeMessage('admin.password.minimumLengthExample', 'E.g.: "5"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.attemptExample', 'Ex "10"')} + placeholder={Utils.localizeMessage('admin.service.attemptExample', 'E.g.: "10"')} helpText={ } - placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'Ex "10"')} + placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'E.g.: "10"')} helpText={ } - placeholder={Utils.localizeMessage('admin.rate.maxBurstExample', 'Ex "100"')} + placeholder={Utils.localizeMessage('admin.rate.maxBurstExample', 'E.g.: "100"')} helpText={ } - placeholder={Utils.localizeMessage('admin.rate.memoryExample', 'Ex "10000"')} + placeholder={Utils.localizeMessage('admin.rate.memoryExample', 'E.g.: "10000"')} helpText={ } - placeholder={Utils.localizeMessage('admin.rate.httpHeaderExample', 'Ex "X-Real-IP", "X-Forwarded-For"')} + placeholder={Utils.localizeMessage('admin.rate.httpHeaderExample', 'E.g.: "X-Real-IP", "X-Forwarded-For"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.idpUrlEx', 'Ex "https://idp.example.org/SAML2/SSO/Login"')} + placeholder={Utils.localizeMessage('admin.saml.idpUrlEx', 'E.g.: "https://idp.example.org/SAML2/SSO/Login"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.idpDescriptorUrlEx', 'Ex "https://idp.example.org/SAML2/issuer"')} + placeholder={Utils.localizeMessage('admin.saml.idpDescriptorUrlEx', 'E.g.: "https://idp.example.org/SAML2/issuer"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.assertionConsumerServiceURLEx', 'Ex "https:///login/sso/saml"')} + placeholder={Utils.localizeMessage('admin.saml.assertionConsumerServiceURLEx', 'E.g.: "https:///login/sso/saml"')} helpText={consumerServiceUrlHelp} value={this.state.assertionConsumerServiceURL} onChange={this.handleChange} @@ -465,7 +465,7 @@ export default class SamlSettings extends AdminSettings { defaultMessage='Email Attribute:' /> } - placeholder={Utils.localizeMessage('admin.saml.emailAttrEx', 'Ex "Email" or "PrimaryEmail"')} + placeholder={Utils.localizeMessage('admin.saml.emailAttrEx', 'E.g.: "Email" or "PrimaryEmail"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.usernameAttrEx', 'Ex "Username"')} + placeholder={Utils.localizeMessage('admin.saml.usernameAttrEx', 'E.g.: "Username"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.firstnameAttrEx', 'Ex "FirstName"')} + placeholder={Utils.localizeMessage('admin.saml.firstnameAttrEx', 'E.g.: "FirstName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.lastnameAttrEx', 'Ex "LastName"')} + placeholder={Utils.localizeMessage('admin.saml.lastnameAttrEx', 'E.g.: "LastName"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.nicknameAttrEx', 'Ex "Nickname"')} + placeholder={Utils.localizeMessage('admin.saml.nicknameAttrEx', 'E.g.: "Nickname"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.localeAttrEx', 'Ex "Locale" or "PrimaryLanguage"')} + placeholder={Utils.localizeMessage('admin.saml.localeAttrEx', 'E.g.: "Locale" or "PrimaryLanguage"')} helpText={ } - placeholder={Utils.localizeMessage('admin.saml.loginButtonTextEx', 'Ex "With OKTA"')} + placeholder={Utils.localizeMessage('admin.saml.loginButtonTextEx', 'E.g.: "With OKTA"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.sessionIdleTimeoutEx', 'Ex "60"')} + placeholder={Utils.localizeMessage('admin.service.sessionIdleTimeoutEx', 'E.g.: "60"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')} + placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')} + placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')} + placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')} helpText={ } - placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')} + placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.localExample', 'Ex "./data/"')} + placeholder={Utils.localizeMessage('admin.image.localExample', 'E.g.: "./data/"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.amazonS3BucketExample', 'Ex "mattermost-media"')} + placeholder={Utils.localizeMessage('admin.image.amazonS3BucketExample', 'E.g.: "mattermost-media"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.amazonS3RegionExample', 'Ex "us-east-1"')} + placeholder={Utils.localizeMessage('admin.image.amazonS3RegionExample', 'E.g.: "us-east-1"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.amazonS3EndpointExample', 'Ex "s3.amazonaws.com"')} + placeholder={Utils.localizeMessage('admin.image.amazonS3EndpointExample', 'E.g.: "s3.amazonaws.com"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.amazonS3IdExample', 'Ex "AKIADTOVBGERKLCBV"')} + placeholder={Utils.localizeMessage('admin.image.amazonS3IdExample', 'E.g.: "AKIADTOVBGERKLCBV"')} helpText={ } - placeholder={Utils.localizeMessage('admin.image.amazonS3SecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} + placeholder={Utils.localizeMessage('admin.image.amazonS3SecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.gatewayWebsocketUrlExample', 'Ex "wss://webrtc.mattermost.com:8189"')} + placeholder={Utils.localizeMessage('admin.webrtc.gatewayWebsocketUrlExample', 'E.g.: "wss://webrtc.mattermost.com:8189"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.gatewayAdminUrlExample', 'Ex "https://webrtc.mattermost.com:7089/admin"')} + placeholder={Utils.localizeMessage('admin.webrtc.gatewayAdminUrlExample', 'E.g.: "https://webrtc.mattermost.com:7089/admin"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.gatewayAdminSecretExample', 'Ex "PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy"')} + placeholder={Utils.localizeMessage('admin.webrtc.gatewayAdminSecretExample', 'E.g.: "PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.stunUriExample', 'Ex "stun:webrtc.mattermost.com:5349"')} + placeholder={Utils.localizeMessage('admin.webrtc.stunUriExample', 'E.g.: "stun:webrtc.mattermost.com:5349"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.turnUriExample', 'Ex "turn:webrtc.mattermost.com:5349"')} + placeholder={Utils.localizeMessage('admin.webrtc.turnUriExample', 'E.g.: "turn:webrtc.mattermost.com:5349"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.turnUsernameExample', 'Ex "myusername"')} + placeholder={Utils.localizeMessage('admin.webrtc.turnUsernameExample', 'E.g.: "myusername"')} helpText={ } - placeholder={Utils.localizeMessage('admin.webrtc.turnSharedKeyExample', 'Ex "bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg="')} + placeholder={Utils.localizeMessage('admin.webrtc.turnSharedKeyExample', 'E.g.: "bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg="')} helpText={ will attempt to get the Hostname from the OS or use the IP Address. You can override the hostname of this server with this property. It is not recommended to override the Hostname unless needed. This property can also be set to a specific IP Address if needed.", - "admin.cluster.OverrideHostnameEx": "x \"app-server-01\"", + "admin.cluster.OverrideHostnameEx": "E.g.: \"app-server-01\"", "admin.cluster.ReadOnlyConfig": "Read Only Config:", "admin.cluster.ReadOnlyConfigDesc": "When true, the server will reject changes made to the configuration file from the system console. When running in production it is recommened to set this to true.", "admin.cluster.StreamingPort": "Streaming Port:", "admin.cluster.StreamingPortDesc": "The port used for streaming data between servers.", - "admin.cluster.StreamingPortEx": "x \"8075\"", + "admin.cluster.StreamingPortEx": "E.g.: \"8075\"", "admin.cluster.UseExperimentalGossip": "Use Experimental Gossip:", "admin.cluster.UseExperimentalGossipDesc": "When true, the server will attempt to communicate via the gossip protocol over the gossip port. When false the server will attempt to communicate over the streaming port. When false the gossip port and protocol are still used to determine cluster health.", "admin.cluster.UseIpAddress": "Use IP Address:", @@ -971,7 +971,7 @@ "admin.service.sessionDaysEx": "E.g.: \"30\"", "admin.service.sessionIdleTimeout": "Session Idle Timeout (minutes):", "admin.service.sessionIdleTimeoutDesc": "The number of minutes from the last time a user was active on the system to the expiry of the user's session. Once expired, the user will need to log in to continue. Minimum is 5 minutes, and 0 is unlimited.

Applies to the desktop app and browsers. For mobile apps, use an EMM provider to lock the app when not in use. In High Availability mode, enable IP hash load balancing for reliable timeout measurement.", - "admin.service.sessionIdleTimeoutEx": "Ex \"60\"", + "admin.service.sessionIdleTimeoutEx": "E.g.: \"60\"", "admin.service.siteURL": "Site URL:", "admin.service.siteURLDescription": "The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://mattermost.example.com:8065. This setting is required.", "admin.service.siteURLExample": "E.g.: \"https://mattermost.example.com:1234\"",