diff options
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/ajax/testConfiguration.php | 8 | ||||
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabLoginFilter.js | 6 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Wizard.php | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 0416e49767b..d48a6be9382 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -67,19 +67,19 @@ try { $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn')); } catch (\Exception $e) { if($e->getCode() === 1) { - OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.'))); + OCP\JSON::error(array('message' => $l->t('Invalid configuration: Anonymous binding is not allowed.'))); exit; } } OCP\JSON::success(array('message' - => $l->t('The configuration is valid and the connection could be established!'))); + => $l->t('Valid configuration, connection established!'))); } else { OCP\JSON::error(array('message' - => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'))); + => $l->t('Valid configuration, but binding failed. Please check the server settings and credentials.'))); } } else { OCP\JSON::error(array('message' - => $l->t('The configuration is invalid. Please have a look at the logs for further details.'))); + => $l->t('Invalid configuration. Please have a look at the logs for further details.'))); } } catch (\Exception $e) { OCP\JSON::error(array('message' => $e->getMessage())); diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js index a2537539ede..7cc35aae0aa 100644 --- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js +++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js @@ -142,16 +142,16 @@ OCA = OCA || {}; var usersFound = parseInt(result.changes.ldap_test_loginname, 10); if(usersFound < 1) { var filter = $('<p>').text(result.changes.ldap_test_effective_filter).html(); - message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>' + filter); + message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command-line validation): <br/>' + filter); console.warn(filter); isHtml = true; } else if(usersFound === 1) { message = t('user_ldap', 'User found and settings verified.'); } else if(usersFound > 1) { - message = t('user_ldap', 'Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter.'); + message = t('user_ldap', 'Consider narrowing your search, as it encompassed many users, only the first one of whom will be able to log in.'); } } else { - message = t('user_ldap', 'An unspecified error occurred. Please check the settings and the log.'); + message = t('user_ldap', 'An unspecified error occurred. Please check log and settings.'); if(!_.isUndefined(result.message) && result.message) { message = result.message; } diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index 73fcd4f1e44..dfbde31314e 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -107,7 +107,7 @@ class Wizard extends LDAPUtility { } else if ($type === 'objects') { $result = $this->access->countObjects($limit); } else { - throw new \Exception('internal error: invalid object type', 500); + throw new \Exception('Internal error: Invalid object type', 500); } return $result; @@ -244,7 +244,7 @@ class Wizard extends LDAPUtility { } }; - throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.')); + throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.')); } /** |