From bbc72b4e945d719ca92a033bf572d5cd77100b3f Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 14 Aug 2003 16:23:43 +0000 Subject: [PATCH] improved predefined attributes, small translation update --- lam/lib/ldap.inc | 14 +++++++------- lam/locale/de_DE/LC_MESSAGES/messages.mo | Bin 26396 -> 26398 bytes lam/locale/de_DE/LC_MESSAGES/messages.po | 6 +++--- lam/templates/lists/listgroups.php | 2 +- lam/templates/lists/listhosts.php | 2 +- lam/templates/lists/listusers.php | 3 ++- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lam/lib/ldap.inc b/lam/lib/ldap.inc index 056cf280..4367bf9e 100644 --- a/lam/lib/ldap.inc +++ b/lam/lib/ldap.inc @@ -53,21 +53,21 @@ class Ldap{ // construct arrays with known LDAP attributes $this->ldapUserAttributes = array ( "uid" => _("User ID"), - "uidNumber" => _("UID number"), - "gidNumber" => _("GID number"), + "uidnumber" => _("UID number"), + "gidnumber" => _("GID number"), "cn" => _("Username"), "host" => _("Allowed hosts"), - "givenName" => _("First name"), + "givenname" => _("First name"), "sn" => _("Last name"), - "homeDirectory" => _("Home directory"), - "loginShell" => _("Login shell"), + "homedirectory" => _("Home directory"), + "loginshell" => _("Login shell"), "mail" => _("E-Mail"), "gecos" => _("Description") ); $this->ldapGroupAttributes = array ( "cn" => _("Group name"), - "gidNumber" => _("GID number"), - "memberUID" => _("Group members"), + "gidnumber" => _("GID number"), + "memberuid" => _("Group members"), "member" => _("Group member DNs"), "description" => _("Group description") ); diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo index be3d482e866d3ac788c650faa24837f8ced89104..81c657028a0c68b034d4eac8e71c46bb33b135ea 100644 GIT binary patch delta 674 zcmXZZO(?^07{KvoW7xdE&Ae{Jh0T&^NR)9vE9F8B^Ol2)T-85nmqiW^F4{@CNtTr6 zBo2~;T(sjH9aj=9-)H-uKF{;?>*;x(-`T4r{%X0JcN!%k@)j29z!a8a7K2!}Boe?m z^kWRi@ecd&*R1=NMe51J=)zs>!b8+P*EosaXv5JJ5eH7Jh#{>6AqpPcMkgL&8=j*Z zAFu_}=s}6(8?<8?sTXT-2&-@wJ27l}fOX^-*nml_#P^7i4?Zc_DP*t|v*rWGs^kW2 zLcL4?yK%~_@1PEFjMaE%)-SPw`~~$QDb#lv)IOFq5xsn+L7kT77oMUGZ?PBe^E%{%?lz5Gv~yW`LO@9uZ;Y)L&^(#uYxT0~w$BE9&AwOGUe+Sf(K za1nO-wNDyn@f$1AAEq}>hsBUCf&~h0+(jpzVmDr5 z58h)Z=FyEms114|A~iUGO*o1TIEQ^0G(E-^@+)k^EY{;|#3%(H6l@f}(1Ats1M8;z z59mU@j1LDeVAf-(1Ds(ao}2Y+tRsIyy+{uAyD!u}zi7o;W2-co6ZI)PsDpS>8%$t3 zE?_f8u>+4#FPB8!ID>kjNAzPJ$FXZ$WCqvJiz(End_i5rkR5(X;4xiAA9);g!Yo$d z1O9J>I%p2(F^@|)7!@f;11m6&x^V*a36offH#mfMCGGM_P)4CWlXDdUj+NNqeq?V) KF!LUowEY1GA7U{8 diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.po b/lam/locale/de_DE/LC_MESSAGES/messages.po index 4b30e105..0f9a9aff 100644 --- a/lam/locale/de_DE/LC_MESSAGES/messages.po +++ b/lam/locale/de_DE/LC_MESSAGES/messages.po @@ -1,4 +1,4 @@ -# $Id: messages.po,v 1.9 2003/08/14 13:21:11 gruberroland Exp $ +# $Id: messages.po,v 1.10 2003/08/14 15:28:06 gruberroland Exp $ # # # LDAP Account Manager @@ -2092,11 +2092,11 @@ msgstr "Suffix" #: ../templates/account.php:439 ../templates/masscreate.php:196 #: ../templates/massdetail.php:97 ../help/help.inc:171 ../lib/account.inc:184 msgid "Surname" -msgstr "Vorname" +msgstr "Nachname" #: ../lib/account.inc:184 msgid "Surname contents invalid characters" -msgstr "Vorname enthält ungültige Zeichen" +msgstr "Nachname enthält ungültige Zeichen" #: ../help/help.inc:172 msgid "" diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php index 56e22728..eaa85648 100644 --- a/lam/templates/lists/listgroups.php +++ b/lam/templates/lists/listgroups.php @@ -84,7 +84,7 @@ else for ($i = 0; $i < sizeof($temp_array); $i++) { // if value is predifined, look up description in hash_table if (substr($temp_array[$i],0,1) == "#") { - $attr = substr($temp_array[$i],1); + $attr = strtolower(substr($temp_array[$i],1)); $attr_array[$i] = $attr; $desc_array[] = strtoupper($hash_table[$attr]); } diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php index 8e4fbe9b..395cc9a5 100644 --- a/lam/templates/lists/listhosts.php +++ b/lam/templates/lists/listhosts.php @@ -84,7 +84,7 @@ else for ($i = 0; $i < sizeof($temp_array); $i++) { // if value is predifined, look up description in hash_table if (substr($temp_array[$i],0,1) == "#") { - $attr = substr($temp_array[$i],1); + $attr = strtolower(substr($temp_array[$i],1)); $attr_array[$i] = $attr; $desc_array[] = strtoupper($hash_table[$attr]); } diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index bb279ff9..39ff84e4 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -79,10 +79,11 @@ if ($_SESSION["config"]->get_MaxListEntries() <= 0) $max_pageentrys = $_SESSION["config"]->get_MaxListEntries(); +// generate column attributes and descriptions for ($i = 0; $i < sizeof($temp_array); $i++) { // if value is predifined, look up description in hash_table if (substr($temp_array[$i],0,1) == "#") { - $attr = substr($temp_array[$i],1); + $attr = strtolower(substr($temp_array[$i],1)); $attr_array[$i] = $attr; $desc_array[] = strtoupper($hash_table[$attr]); }