From 22364605836a1f87f37445fdab13fae944786969 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 8 Aug 2009 02:30:19 +0000 Subject: [PATCH] Forward port LDAP relabeling. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/i18n/English/AuthLDAP.pm | 56 +++++++++++++++-------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e86bab914..0c5137093 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - fixed #10316: Cannot view pending version tags - fixed #10710: testEnvironment 7.6.33 - fixed #9777: Cursor disappears in non-Rich Editor window + - fixed LDAP labels were made more consistent with typical usage. - fixed #10667: cannot change size of template editor - fixed #10654: Story Archive: Search not working properly - fixed #10692: Unprivileged users can stop spectre diff --git a/lib/WebGUI/i18n/English/AuthLDAP.pm b/lib/WebGUI/i18n/English/AuthLDAP.pm index 0b4fd6a1b..7f396bcf9 100644 --- a/lib/WebGUI/i18n/English/AuthLDAP.pm +++ b/lib/WebGUI/i18n/English/AuthLDAP.pm @@ -90,8 +90,8 @@ our $I18N = { }, '7' => { - message => q|LDAP Identity Name|, - lastUpdated => 1031514049 + message => q|Username Label|, + lastUpdated => 1249690147, }, '2' => { @@ -130,8 +130,8 @@ our $I18N = { }, '6' => { - message => q|LDAP Identity (default)|, - lastUpdated => 1031514049 + message => q|Username Attribute|, + lastUpdated => 1249689883, }, '3' => { @@ -150,13 +150,18 @@ our $I18N = { }, '8' => { - message => q|LDAP Password Name|, - lastUpdated => 1031514049 + message => q|Password Label|, + lastUpdated => 1249690167, }, '4' => { - message => q|Connect DN|, - lastUpdated => 1031514049 + message => q|LDAP Proxy Username|, + lastUpdated => 1031514049, + }, + + 'connect_dn_help' => { + message => q|The distinguished name used to make an LDAP connection. Used to be called Connect DN.|, + lastUpdated => 1249688660, }, 'account.form.karma' => { @@ -510,10 +515,10 @@ our $I18N = { lastUpdated => 1116151382 }, -# 'LDAPLink_990' => { -# message => q|Edit LDAP Connection|, -# lastUpdated => 1056151382 -# }, + 'LDAPLink_990' => { + message => q|Edit LDAP Connection|, + lastUpdated => 1056151382 + }, 'LDAPLink_991' => { message => q|LDAP Connection ID|, @@ -531,13 +536,13 @@ our $I18N = { }, 'LDAPLink_994' => { - message => q|Connect DN|, - lastUpdated => 1056151382 + message => q|LDAP Proxy Username|, + lastUpdated => 1249689834, }, 'LDAPLink_995' => { - message => q|Identifier|, - lastUpdated => 1056151382 + message => q|LDAP Proxy Password|, + lastUpdated => 1249689837, }, 'LDAPLink_992 description' => { @@ -553,16 +558,15 @@ our $I18N = { }, 'LDAPLink_994 description' => { - message => q|

DN = Distinguished Name. A DN is a unique path to a particular object within an LDAP -directory. In this case, the "Connect DN" is the DN that points to the user account + message => q|

The LDAP Proxy Username is the DN (Distinguished Name) that points to the user account record for authenticating against this LDAP server at a permission level that has full read and write access to all of the users and groups on your LDAP server. Usually that will look something like:

cn=Joe Shmoe,ou=people,dc=example,dc=com

|, - lastUpdated => 1146630168, + lastUpdated => 1249689806, }, 'LDAPLink_995 description' => { - message => q|The password for the account entered in the "Connect DN" field|, + message => q|The password for the account entered in the "LDAP Proxy Username" field|, lastUpdated => 1120164594, }, @@ -575,18 +579,18 @@ and should be entered as such.

|, }, '6 description' => { - message => q|The LDAP Identity is the unique identifier in the LDAP server that the user will be identified against. Often this field is shortname, which takes the form of first initial + last name. Example: jdoe. Therefore, if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process.|, - lastUpdated => 1165512076, + message => q|The Username Attribute is the unique identifier in the LDAP server that the user will be identified against. Often this field is cn, uid, or shortname. Example: jdoe. Therefore, if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process.|, + lastUpdated => 1249690122, }, '7 description' => { - message => q|The label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consistency.|, - lastUpdated => 1120164594, + message => q|The label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consistency. Used to be called LDAP Identity Label.|, + lastUpdated => 1249690190, }, '8 description' => { - message => q|Just as the LDAP Identity Name is a label, so is the LDAP Password Name. Use this label as you would LDAP Identity Name.|, - lastUpdated => 1120164594, + message => q|The label used to describe the field where the user will enter a password for authentication. Used to be called LDAP Password Name.|, + lastUpdated => 1249690272, }, '868 description' => {