Commit 5c2d6361 authored by Yusuke Nemoto's avatar Yusuke Nemoto Committed by Elias Nahum
Browse files

Fix typos (#984)

* fix typos

* fix 'Ex' to 'E.g.:'

* fix typo

* Fix codebase for message changes

* Fix default messages in codebase
parent d85c6a31
......@@ -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,
},
......
......@@ -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={
<FormattedMessage
id='admin.cluster.ClusterNameDesc'
......@@ -168,7 +168,7 @@ export default class ClusterSettings extends AdminSettings {
defaultMessage='Override Hostname:'
/>
}
placeholder={Utils.localizeMessage('admin.cluster.OverrideHostnameEx', 'Ex "app-server-01"')}
placeholder={Utils.localizeMessage('admin.cluster.OverrideHostnameEx', 'E.g.: "app-server-01"')}
helpText={
<FormattedMessage
id='admin.cluster.OverrideHostnameDesc'
......@@ -237,11 +237,11 @@ export default class ClusterSettings extends AdminSettings {
defaultMessage='Gossip Port:'
/>
}
placeholder={Utils.localizeMessage('admin.cluster.GossipPortEx', 'Ex "8074"')}
placeholder={Utils.localizeMessage('admin.cluster.GossipPortEx', 'E.g.: "8074"')}
helpText={
<FormattedMessage
id='admin.cluster.GossipPortDesc'
defaultMessage='The port used for the gossip protocol. Both UDP and TCP should abe allowed on this port.'
defaultMessage='The port used for the gossip protocol. Both UDP and TCP should be allowed on this port.'
/>
}
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={
<FormattedMessage
id='admin.cluster.StreamingPortDesc'
......
......@@ -135,7 +135,7 @@ export default class CustomBrandSettings extends AdminSettings {
/>
}
maxLength={Constants.MAX_SITENAME_LENGTH}
placeholder={Utils.localizeMessage('admin.team.siteNameExample', 'Ex "Mattermost"')}
placeholder={Utils.localizeMessage('admin.team.siteNameExample', 'E.g.: "Mattermost"')}
helpText={
<FormattedMessage
id='admin.team.siteNameDescription'
......
......@@ -150,7 +150,7 @@ export default class DatabaseSettings extends AdminSettings {
defaultMessage='Maximum Idle Connections:'
/>
}
placeholder={Utils.localizeMessage('admin.sql.maxConnectionsExample', 'Ex "10"')}
placeholder={Utils.localizeMessage('admin.sql.maxConnectionsExample', 'E.g.: "10"')}
helpText={
<FormattedMessage
id='admin.sql.maxConnectionsDescription'
......@@ -168,7 +168,7 @@ export default class DatabaseSettings extends AdminSettings {
defaultMessage='Maximum Open Connections:'
/>
}
placeholder={Utils.localizeMessage('admin.sql.maxOpenExample', 'Ex "10"')}
placeholder={Utils.localizeMessage('admin.sql.maxOpenExample', 'E.g.: "10"')}
helpText={
<FormattedMessage
id='admin.sql.maxOpenDescription'
......@@ -186,7 +186,7 @@ export default class DatabaseSettings extends AdminSettings {
defaultMessage='Query Timeout:'
/>
}
placeholder={Utils.localizeMessage('admin.sql.queryTimeoutExample', 'Ex "30"')}
placeholder={Utils.localizeMessage('admin.sql.queryTimeoutExample', 'E.g.: "30"')}
helpText={
<FormattedMessage
id='admin.sql.queryTimeoutDescription'
......@@ -204,7 +204,7 @@ export default class DatabaseSettings extends AdminSettings {
defaultMessage='At Rest Encrypt Key:'
/>
}
placeholder={Utils.localizeMessage('admin.sql.keyExample', 'Ex "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"')}
placeholder={Utils.localizeMessage('admin.sql.keyExample', 'E.g.: "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"')}
helpText={
<FormattedMessage
id='admin.sql.keyDescription'
......
......@@ -50,7 +50,7 @@ export default class ExternalServiceSettings extends AdminSettings {
defaultMessage='Google API Key:'
/>
}
placeholder={Utils.localizeMessage('admin.service.googleExample', 'Ex "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"')}
placeholder={Utils.localizeMessage('admin.service.googleExample', 'E.g.: "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"')}
helpText={
<FormattedHTMLMessage
id='admin.service.googleDescription'
......
......@@ -102,7 +102,7 @@ export default class GitLabSettings extends AdminSettings {
defaultMessage='Application ID:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
helpText={
<FormattedMessage
id='admin.gitlab.clientIdDescription'
......@@ -121,7 +121,7 @@ export default class GitLabSettings extends AdminSettings {
defaultMessage='Application Secret Key:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
helpText={
<FormattedMessage
id='admin.gitlab.clientSecretDescription'
......
......@@ -177,7 +177,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='AD/LDAP Server:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.serverEx', 'Ex "10.0.0.23"')}
placeholder={Utils.localizeMessage('admin.ldap.serverEx', 'E.g.: "10.0.0.23"')}
helpText={
<FormattedMessage
id='admin.ldap.serverDesc'
......@@ -196,7 +196,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='AD/LDAP Port:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.portEx', 'Ex "389"')}
placeholder={Utils.localizeMessage('admin.ldap.portEx', 'E.g.: "389"')}
helpText={
<FormattedMessage
id='admin.ldap.portDesc'
......@@ -237,7 +237,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='BaseDN:'
/>
}
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={
<FormattedMessage
id='admin.ldap.baseDesc'
......@@ -311,7 +311,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='First Name Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.firstnameAttrEx', 'Ex "givenName"')}
placeholder={Utils.localizeMessage('admin.ldap.firstnameAttrEx', 'E.g.: "givenName"')}
helpText={
<FormattedMessage
id='admin.ldap.firstnameAttrDesc'
......@@ -330,7 +330,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Last Name Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.lastnameAttrEx', 'Ex "sn"')}
placeholder={Utils.localizeMessage('admin.ldap.lastnameAttrEx', 'E.g.: "sn"')}
helpText={
<FormattedMessage
id='admin.ldap.lastnameAttrDesc'
......@@ -349,7 +349,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Nickname Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.nicknameAttrEx', 'Ex "nickname"')}
placeholder={Utils.localizeMessage('admin.ldap.nicknameAttrEx', 'E.g.: "nickname"')}
helpText={
<FormattedMessage
id='admin.ldap.nicknameAttrDesc'
......@@ -387,7 +387,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Email Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.emailAttrEx', 'Ex "mail" or "userPrincipalName"')}
placeholder={Utils.localizeMessage('admin.ldap.emailAttrEx', 'E.g.: "mail" or "userPrincipalName"')}
helpText={
<FormattedMessage
id='admin.ldap.emailAttrDesc'
......@@ -406,7 +406,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Username Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.usernameAttrEx', 'Ex "sAMAccountName"')}
placeholder={Utils.localizeMessage('admin.ldap.usernameAttrEx', 'E.g.: "sAMAccountName"')}
helpText={
<FormattedMessage
id='admin.ldap.uernameAttrDesc'
......@@ -425,7 +425,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='ID Attribute: '
/>
}
placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'Ex "sAMAccountName"')}
placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'E.g.: "sAMAccountName"')}
helpText={
<FormattedMessage
id='admin.ldap.idAttrDesc'
......@@ -444,7 +444,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Sign-in Field Default Text:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "AD/LDAP Username"')}
placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'E.g.: "AD/LDAP Username"')}
helpText={
<FormattedMessage
id='admin.ldap.loginNameDesc'
......@@ -481,7 +481,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Maximum Page Size:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'Ex "2000"')}
placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'E.g.: "2000"')}
helpText={
<FormattedMessage
id='admin.ldap.maxPageSizeHelpText'
......@@ -500,7 +500,7 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Query Timeout (seconds):'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'Ex "60"')}
placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'E.g.: "60"')}
helpText={
<FormattedMessage
id='admin.ldap.queryDesc'
......
......@@ -77,7 +77,7 @@ export default class MetricsSettings extends AdminSettings {
defaultMessage='Listen Address:'
/>
}
placeholder={Utils.localizeMessage('admin.metrics.listenAddressEx', 'Ex ":8067"')}
placeholder={Utils.localizeMessage('admin.metrics.listenAddressEx', 'E.g.: ":8067"')}
helpText={
<FormattedMessage
id='admin.metrics.listenAddressDesc'
......
......@@ -148,7 +148,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Client ID:'
/>
}
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={
<FormattedMessage
id='admin.google.clientIdDescription'
......@@ -166,7 +166,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Client Secret:'
/>
}
placeholder={Utils.localizeMessage('admin.google.clientSecretExample', 'Ex "H8sz0Az-dDs2p15-7QzD231"')}
placeholder={Utils.localizeMessage('admin.google.clientSecretExample', 'E.g.: "H8sz0Az-dDs2p15-7QzD231"')}
helpText={
<FormattedMessage
id='admin.google.clientSecretDescription'
......@@ -224,7 +224,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Application ID:'
/>
}
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={
<FormattedMessage
id='admin.office365.clientIdDescription'
......@@ -242,7 +242,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Application Secret Password:'
/>
}
placeholder={Utils.localizeMessage('admin.office365.clientSecretExample', 'Ex "shAieM47sNBfgl20f8ci294"')}
placeholder={Utils.localizeMessage('admin.office365.clientSecretExample', 'E.g.: "shAieM47sNBfgl20f8ci294"')}
helpText={
<FormattedMessage
id='admin.office365.clientSecretDescription'
......@@ -300,7 +300,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Application ID:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
helpText={
<FormattedMessage
id='admin.gitlab.clientIdDescription'
......@@ -318,7 +318,7 @@ export default class OAuthSettings extends AdminSettings {
defaultMessage='Application Secret Key:'
/>
}
placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
helpText={
<FormattedMessage
id='admin.gitlab.clientSecretDescription'
......
......@@ -158,7 +158,7 @@ export default class PasswordSettings extends AdminSettings {
defaultMessage='Minimum Password Length:'
/>
}
placeholder={Utils.localizeMessage('admin.password.minimumLengthExample', 'Ex "5"')}
placeholder={Utils.localizeMessage('admin.password.minimumLengthExample', 'E.g.: "5"')}
helpText={
<FormattedMessage
id='admin.password.minimumLengthDescription'
......@@ -267,7 +267,7 @@ export default class PasswordSettings extends AdminSettings {
defaultMessage='Maximum Login Attempts:'
/>
}
placeholder={Utils.localizeMessage('admin.service.attemptExample', 'Ex "10"')}
placeholder={Utils.localizeMessage('admin.service.attemptExample', 'E.g.: "10"')}
helpText={
<FormattedMessage
id='admin.service.attemptDescription'
......
......@@ -89,7 +89,7 @@ export default class RateSettings extends AdminSettings {
defaultMessage='Maximum Queries per Second:'
/>
}
placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'Ex "10"')}
placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'E.g.: "10"')}
helpText={
<FormattedMessage
id='admin.rate.queriesDescription'
......@@ -108,7 +108,7 @@ export default class RateSettings extends AdminSettings {
defaultMessage='Maximum Burst Size:'
/>
}
placeholder={Utils.localizeMessage('admin.rate.maxBurstExample', 'Ex "100"')}
placeholder={Utils.localizeMessage('admin.rate.maxBurstExample', 'E.g.: "100"')}
helpText={
<FormattedMessage
id='admin.rate.maxBurstDescription'
......@@ -127,7 +127,7 @@ export default class RateSettings extends AdminSettings {
defaultMessage='Memory Store Size:'
/>
}
placeholder={Utils.localizeMessage('admin.rate.memoryExample', 'Ex "10000"')}
placeholder={Utils.localizeMessage('admin.rate.memoryExample', 'E.g.: "10000"')}
helpText={
<FormattedMessage
id='admin.rate.memoryDescription'
......@@ -182,7 +182,7 @@ export default class RateSettings extends AdminSettings {
defaultMessage='Vary rate limit by HTTP header:'
/>
}
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={
<FormattedMessage
id='admin.rate.httpHeaderDescription'
......
......@@ -374,7 +374,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='SAML SSO URL:'
/>
}
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={
<FormattedMessage
id='admin.saml.idpUrlDesc'
......@@ -393,7 +393,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Identity Provider Issuer URL:'
/>
}
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={
<FormattedMessage
id='admin.saml.idpDescriptorUrlDesc'
......@@ -431,7 +431,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Service Provider Login URL:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.assertionConsumerServiceURLEx', 'Ex "https://<your-mattermost-url>/login/sso/saml"')}
placeholder={Utils.localizeMessage('admin.saml.assertionConsumerServiceURLEx', 'E.g.: "https://<your-mattermost-url>/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={
<FormattedMessage
id='admin.saml.emailAttrDesc'
......@@ -484,7 +484,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Username Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.usernameAttrEx', 'Ex "Username"')}
placeholder={Utils.localizeMessage('admin.saml.usernameAttrEx', 'E.g.: "Username"')}
helpText={
<FormattedMessage
id='admin.saml.usernameAttrDesc'
......@@ -503,7 +503,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='First Name Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.firstnameAttrEx', 'Ex "FirstName"')}
placeholder={Utils.localizeMessage('admin.saml.firstnameAttrEx', 'E.g.: "FirstName"')}
helpText={
<FormattedMessage
id='admin.saml.firstnameAttrDesc'
......@@ -522,7 +522,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Last Name Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.lastnameAttrEx', 'Ex "LastName"')}
placeholder={Utils.localizeMessage('admin.saml.lastnameAttrEx', 'E.g.: "LastName"')}
helpText={
<FormattedMessage
id='admin.saml.lastnameAttrDesc'
......@@ -541,7 +541,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Nickname Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.nicknameAttrEx', 'Ex "Nickname"')}
placeholder={Utils.localizeMessage('admin.saml.nicknameAttrEx', 'E.g.: "Nickname"')}
helpText={
<FormattedMessage
id='admin.saml.nicknameAttrDesc'
......@@ -579,7 +579,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Preferred Language Attribute:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.localeAttrEx', 'Ex "Locale" or "PrimaryLanguage"')}
placeholder={Utils.localizeMessage('admin.saml.localeAttrEx', 'E.g.: "Locale" or "PrimaryLanguage"')}
helpText={
<FormattedMessage
id='admin.saml.localeAttrDesc'
......@@ -598,7 +598,7 @@ export default class SamlSettings extends AdminSettings {
defaultMessage='Login Button Text:'
/>
}
placeholder={Utils.localizeMessage('admin.saml.loginButtonTextEx', 'Ex "With OKTA"')}
placeholder={Utils.localizeMessage('admin.saml.loginButtonTextEx', 'E.g.: "With OKTA"')}
helpText={
<FormattedMessage
id='admin.saml.loginButtonTextDesc'
......
......@@ -68,7 +68,7 @@ export default class SessionSettings extends AdminSettings {
defaultMessage='Session Idle Timeout (minutes):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionIdleTimeoutEx', 'Ex "60"')}
placeholder={Utils.localizeMessage('admin.service.sessionIdleTimeoutEx', 'E.g.: "60"')}
helpText={
<FormattedHTMLMessage
id='admin.service.sessionIdleTimeoutDesc'
......@@ -91,7 +91,7 @@ export default class SessionSettings extends AdminSettings {
defaultMessage='Session Length AD/LDAP and Email (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')}
helpText={
<FormattedMessage
id='admin.service.webSessionDaysDesc'
......@@ -109,7 +109,7 @@ export default class SessionSettings extends AdminSettings {
defaultMessage='Session Length Mobile (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')}
helpText={
<FormattedMessage
id='admin.service.mobileSessionDaysDesc'
......@@ -127,7 +127,7 @@ export default class SessionSettings extends AdminSettings {
defaultMessage='Session Length SSO (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')}
helpText={
<FormattedMessage
id='admin.service.ssoSessionDaysDesc'
......@@ -145,7 +145,7 @@ export default class SessionSettings extends AdminSettings {
defaultMessage='Session Cache (minutes):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'E.g.: "30"')}
helpText={
<FormattedMessage
id='admin.service.sessionCacheDesc'
......
......@@ -184,7 +184,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Local Storage Directory:'
/>
}
placeholder={Utils.localizeMessage('admin.image.localExample', 'Ex "./data/"')}
placeholder={Utils.localizeMessage('admin.image.localExample', 'E.g.: "./data/"')}
helpText={
<FormattedMessage
id='admin.image.localDescription'
......@@ -203,7 +203,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Amazon S3 Bucket:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3BucketExample', 'Ex "mattermost-media"')}
placeholder={Utils.localizeMessage('admin.image.amazonS3BucketExample', 'E.g.: "mattermost-media"')}
helpText={
<FormattedMessage
id='admin.image.amazonS3BucketDescription'
......@@ -222,7 +222,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Amazon S3 Region:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3RegionExample', 'Ex "us-east-1"')}
placeholder={Utils.localizeMessage('admin.image.amazonS3RegionExample', 'E.g.: "us-east-1"')}
helpText={
<FormattedMessage
id='admin.image.amazonS3RegionDescription'
......@@ -241,7 +241,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Amazon S3 Endpoint:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3EndpointExample', 'Ex "s3.amazonaws.com"')}
placeholder={Utils.localizeMessage('admin.image.amazonS3EndpointExample', 'E.g.: "s3.amazonaws.com"')}
helpText={
<FormattedMessage
id='admin.image.amazonS3EndpointDescription'
......@@ -260,7 +260,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Amazon S3 Access Key ID:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3IdExample', 'Ex "AKIADTOVBGERKLCBV"')}
placeholder={Utils.localizeMessage('admin.image.amazonS3IdExample', 'E.g.: "AKIADTOVBGERKLCBV"')}
helpText={
<FormattedHTMLMessage
id='admin.image.amazonS3IdDescription'
......@@ -279,7 +279,7 @@ export default class StorageSettings extends AdminSettings {
defaultMessage='Amazon S3 Secret Access Key:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3SecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
placeholder={Utils.localizeMessage('admin.image.amazonS3SecretExample', 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
helpText={
<FormattedMessage
id='admin.image.amazonS3SecretDescription'
......
......@@ -85,7 +85,7 @@ export default class WebrtcSettings extends AdminSettings {
defaultMessage='Gateway WebSocket URL:'
/>
}
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={
<FormattedMessage
id='admin.webrtc.gatewayWebsocketUrlDescription'
......@@ -105,7 +105,7 @@ export default class WebrtcSettings extends AdminSettings {
defaultMessage='Gateway Admin URL:'
/>
}
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"')}