Major update to System Console labelling (#3398)

Этот коммит содержится в:
Eric Sethna
2016-07-05 07:26:22 -04:00
коммит произвёл Joram Wilander
родитель 0557c03d11
Коммит d2e93e1bee
22 изменённых файлов: 151 добавлений и 142 удалений

Просмотреть файл

@@ -91,7 +91,7 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.enableTitle'
defaultMessage='Enable Login With LDAP:'
defaultMessage='Enable sign-in with LDAP:'
/>
}
helpText={
@@ -320,14 +320,14 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.idAttrTitle'
defaultMessage='Id Attribute: '
defaultMessage='ID Attribute: '
/>
}
placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'Ex "sAMAccountName"')}
helpText={
<FormattedMessage
id='admin.ldap.idAttrDesc'
defaultMessage='The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a users Id Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
defaultMessage='The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a users ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
/>
}
value={this.state.idAttribute}
@@ -339,7 +339,7 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.syncIntervalTitle'
defaultMessage='Synchronization Interval (In Minutes)'
defaultMessage='Synchronization Interval (minutes)'
/>
}
helpText={
@@ -412,7 +412,7 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.loginNameTitle'
defaultMessage='Login Field Name:'
defaultMessage='Sign-in Field Default Text:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "LDAP Username"')}