diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-02 08:31:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-02 08:31:37 -0500 |
| commit | 320fe1c39240644ce15fa2a436ac4a5591b95083 (patch) | |
| tree | 44185c5ed5f7048a67f6514b9c06040aae11397a | |
| parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
| download | chat-320fe1c39240644ce15fa2a436ac4a5591b95083.tar.gz chat-320fe1c39240644ce15fa2a436ac4a5591b95083.tar.bz2 chat-320fe1c39240644ce15fa2a436ac4a5591b95083.zip | |
EE Fixes
| -rw-r--r-- | i18n/en.json | 32 | ||||
| -rw-r--r-- | mattermost.go | 2 |
2 files changed, 34 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index c6d705819..7b7ee344a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3406,5 +3406,37 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" + }, + { + "id": "ent.ldap.do_login.licence_disable.app_error", + "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license." + }, + { + "id": "ent.ldap.do_login.unable_to_connect.app_error", + "translation": "Unable to connect to LDAP server" + }, + { + "id": "ent.ldap.do_login.bind_admin_user.app_error", + "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword." + }, + { + "id": "ent.ldap.do_login.search_ldap_server.app_error", + "translation": "Failed to search LDAP server" + }, + { + "id": "ent.ldap.do_login.user_not_registered.app_error", + "translation": "User not registered on LDAP server" + }, + { + "id": "ent.ldap.do_login.matched_to_many_users.app_error", + "translation": "Username given matches multiple users" + }, + { + "id": "ent.ldap.do_login.invalid_password.app_error", + "translation": "Invalid Password" + }, + { + "id": "ent.ldap.do_login.unable_to_create_user.app_error", + "translation": "Credentials valid but unable to create user." } ] diff --git a/mattermost.go b/mattermost.go index b6652d812..43fa06601 100644 --- a/mattermost.go +++ b/mattermost.go @@ -31,6 +31,8 @@ import ( _ "github.com/go-ldap/ldap" ) +//ENTERPRISE_IMPORTS + var flagCmdCreateTeam bool var flagCmdCreateUser bool var flagCmdAssignRole bool |