Merge pull request #2389 from mattermost/2.1-ldap-help-text

Update BaseDN and Email LDAP settings help text + localization

4 files changed, 10 insertions, 10 deletions

diff --git a/web/react/components/admin_console/ldap_settings.jsx b/web/react/components/admin_console/ldap_settings.jsx
index 535c264dd..4cd19c886 100644
--- a/web/react/components/admin_console/ldap_settings.jsx
+++ b/web/react/components/admin_console/ldap_settings.jsx
@@ -20,7 +20,7 @@ var holders = defineMessages({
     },
     baseEx: {
         id: 'admin.ldap.baseEx',
-        defaultMessage: 'Ex "dc=mydomain,dc=com"'
+        defaultMessage: 'Ex "ou=Unit Name,dc=corp,dc=example,dc=com"'
     },
     firstnameAttrEx: {
         id: 'admin.ldap.firstnameAttrEx',
@@ -32,7 +32,7 @@ var holders = defineMessages({
     },
     emailAttrEx: {
         id: 'admin.ldap.emailAttrEx',
-        defaultMessage: 'Ex "mail"'
+        defaultMessage: 'Ex "mail" or "userPrincipalName"'
     },
     usernameAttrEx: {
         id: 'admin.ldap.usernameAttrEx',
@@ -581,4 +581,4 @@ LdapSettings.propTypes = {
     config: React.PropTypes.object
 };
 
-export default injectIntl(LdapSettings);
\ No newline at end of file
+export default injectIntl(LdapSettings);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 4c6fa0eae..58a19ea1b 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -152,14 +152,14 @@
   "admin.ldap.bannerDesc": "If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.",
   "admin.ldap.bannerHeading": "Note:",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
-  "admin.ldap.baseEx": "Ex \"dc=mydomain,dc=com\"",
+  "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
   "admin.ldap.bindPwdDesc": "Password of the user given in \"Bind Username\".",
   "admin.ldap.bindPwdTitle": "Bind Password:",
   "admin.ldap.bindUserDesc": "The username used to perform the LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the LDAP tree specified in the BaseDN field.",
   "admin.ldap.bindUserTitle": "Bind Username:",
   "admin.ldap.emailAttrDesc": "The attribute in the LDAP server that will be used to populate the email addresses of users in Mattermost.",
-  "admin.ldap.emailAttrEx": "Ex \"mail\"",
+  "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Email Attribute:",
   "admin.ldap.enableDesc": "When true, Mattermost allows login using LDAP",
   "admin.ldap.enableTitle": "Enable Login With LDAP:",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index b14470872..89326bff3 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -152,14 +152,14 @@
   "admin.ldap.bannerDesc": "Si el atributo de un usuario cambia en el servidor LDAP será actualizado la próxima vez que el usuario ingrese sus credenciales para iniciar sesión en Mattermost. Esto incluye si un usuario se inactiva o se remueve en el servidor LDAP. Sincronización con servidores LDAP está planificado para futuras versiones.",
   "admin.ldap.bannerHeading": "Nota:",
   "admin.ldap.baseDesc": "El DN Base es el Nombre Distinguido de la ubicación donde Mattermost debe comenzar a buscar a los usuarios en el árbol del LDAP.",
-  "admin.ldap.baseEx": "Ex \"dc=midominio,dc=com\"",
+  "admin.ldap.baseEx": "Ej \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "DN Base:",
   "admin.ldap.bindPwdDesc": "Contraseña del usuario asignado en \"Usuario de Enlace\".",
   "admin.ldap.bindPwdTitle": "Contraseña de Enlace:",
   "admin.ldap.bindUserDesc": "El usuario que realizará las busquedas LDAP. Normalmente este debería ser una cuenta específicamente creada para ser utilizada por Mattermost. Debería contat con acceso limitado para leer la porción del árbol LDAP especificada en el campo DN Base.",
   "admin.ldap.bindUserTitle": "Usuario de Enlace:",
   "admin.ldap.emailAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar la dirección de correo electrónico de los usuarios en Mattermost.",
-  "admin.ldap.emailAttrEx": "Ej \"mail\"",
+  "admin.ldap.emailAttrEx": "Ej \"mail\" o \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Atributo de Correo Electrónico:",
   "admin.ldap.enableDesc": "Cuando es verdadero, Mattermost permite realizar inicio de sesión utilizando LDAP",
   "admin.ldap.enableTitle": "Habilitar inicio de sesión con LDAP:",
diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index f4b998ded..b8c372bdd 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -152,14 +152,14 @@
   "admin.ldap.bannerDesc": "Se um atributo de usuário de mudar no servidor LDAP, ele será atualizado na próxima vez que o usuário inserir suas credenciais para iniciar sessão no Mattermost. Isso inclui se um usuário estiver inativo ou removido de um servidor LDAP. Sincronização com servidores LDAP está prevista para um lançamento futuro.",
   "admin.ldap.bannerHeading": "Nota:",
   "admin.ldap.baseDesc": "Base DN é o nome distinto do local onde Mattermost deve começar sua busca para os usuários na árvore LDAP.",
-  "admin.ldap.baseEx": "Ex \"dc=mydomain,dc=com\"",
+  "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
   "admin.ldap.bindPwdDesc": "Senha do usuário fornecido em \"Bind Username\".",
   "admin.ldap.bindPwdTitle": "Vincular Senha:",
   "admin.ldap.bindUserDesc": "O nome de usuário usado para realizar a pesquisa LDAP. Isso deve ser tipicamente uma conta criada especificamente para uso do Mattermost. Deve ter acesso limitado a ler a parte da árvore LDAP especificado no campo BaseDN.",
   "admin.ldap.bindUserTitle": "Bind Username:",
   "admin.ldap.emailAttrDesc": "O atributo no servidor LDAP que será usado para preencher os endereços de e-mail de usuários no Mattermost.",
-  "admin.ldap.emailAttrEx": "Ex \"mail\"",
+  "admin.ldap.emailAttrEx": "Ex \"mail\" ou \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Atributo de E-mail:",
   "admin.ldap.enableDesc": "Quando verdadeiro, Mattermost permite login utilizando LDAP",
   "admin.ldap.enableTitle": "Ativar Login With LDAP:",
@@ -1288,4 +1288,4 @@
   "view_image_popover.download": "Download",
   "view_image_popover.file": "Arquivo {count} de {total}",
   "view_image_popover.publicLink": "Obter O Link Público"
-}
\ No newline at end of file
+}