Fix typos (mattermost#984)

* fix typos * fix 'Ex' to 'E.g.:' * fix typo * Fix codebase for message changes * Fix default messages in codebase
aprvsh · Mar 23, 2018 · 5c2d636 · 5c2d636
1 parent d85c6a3
commit 5c2d636
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 78 deletions.
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -116,15 +116,15 @@ 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:https://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,
  key: 'ListenAddress',
  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
@@ -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'

diff --git a/components/admin_console/custom_brand_settings.jsx b/components/admin_console/custom_brand_settings.jsx
@@ -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'

diff --git a/components/admin_console/database_settings.jsx b/components/admin_console/database_settings.jsx
@@ -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'

diff --git a/components/admin_console/external_service_settings.jsx b/components/admin_console/external_service_settings.jsx
@@ -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'

diff --git a/components/admin_console/gitlab_settings.jsx b/components/admin_console/gitlab_settings.jsx
@@ -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'

diff --git a/components/admin_console/ldap_settings.jsx b/components/admin_console/ldap_settings.jsx
@@ -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'

diff --git a/components/admin_console/metrics_settings.jsx b/components/admin_console/metrics_settings.jsx
@@ -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'