git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1277 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -10709,7 +10709,7 @@ with another option."))
                     memberUid.append(dataGroup[0][1]['uid'][0])
                 for i in searchRes:
                     i[0][1]['memberUid'] = memberUid
-                data.append((_("Member uid"),"memberUid"))
+                data.append((_("Member UID"),"memberUid"))
                 attributes = map(lambda x: x[0], data)
                 retrAttrs = map(lambda x: x[1], data)
         data = []
@@ -10918,17 +10918,17 @@ with another option."))
             data = [(_("Group"),"cn"),
                     (_("Name"),"description"),
                     ("gid","gidNumber"),
-                    (_("Member uid"),"memberUid")]
+                    (_("Member UID"),"memberUid")]
             if fields == "short":
-                delData = [_("Member uid")]
+                delData = [_("Member UID")]
         elif service == "mail":
             data = [(_("Group"),"cn"),
                     (_("Name"),"description"),
                     (_("Mail"),"mail"),
                     (_("Alternate mail"),"mailAlternateAddress"),
-                    (_("Member uid"),"rfc822member")]
+                    (_("Member UID"),"rfc822member")]
             if fields == "short":
-                delData = [_("Mail"), _("Member uid")]
+                delData = [_("Mail"), _("Member UID")]
         elif service == "jabber":
             data = [(_("Group"),"cn"),
                     (_("Comment"),"description")]
@@ -10939,9 +10939,9 @@ with another option."))
         data = []
         delData = []
         if service == "samba":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
-                    ("uid","uidNumber"),
+                    (("User ID"),"uidNumber"),
                     (_("Group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"sambaNTPassword"),
@@ -10956,22 +10956,22 @@ with another option."))
         data = []
         delData = []
         if service == "unix":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
                     (_("Lock"),"shadowExpire"),
                     (_("Visible"),"shadowFlag"),
-                    ("uid","uidNumber"),
+                    (("User ID"),"uidNumber"),
                     (_("Group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"userPassword"),
                     (_("Last change password"),"shadowLastChange"),
-                    ("Jabber id","registeredAddress"),
+                    (_("Jabber ID"),"registeredAddress"),
                     (_("Mail"),"mail")]
             if fields == "short":
                 delData = [_("Lock"),_("Visible"),_("Password"),
-                           _("Last change password"),"Jabber id",_("Mail")]
+                           _("Last change password"),_("Jabber ID"),_("Mail")]
         elif service == "samba":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"displayName"),
                     (_("Lock"),"accountStatus"),
                     (_("Password"),"sambaNTPassword"),
@@ -10979,7 +10979,7 @@ with another option."))
             if fields == "short":
                 delData = [_("Last change password")]
         elif service == "mail":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
                     (_("Lock"),"accountStatus"),
                     (_("Password"),"userPassword"),
@@ -10988,23 +10988,23 @@ with another option."))
             if fields == "short":
                 delData = [_("Lock"), _("Password"), _("Mail")]
         elif service == "jabber":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
                     (_("Lock"),"initials"),
                     (_("Group"),"departmentNumber"),
                     (_("Password"),"userPassword"),
-                    ("Jabber id","mail")]
+                    (_("Jabber ID"),"mail")]
             if fields == "short":
                 delData = [_("Lock"), _("Group"), _("Password")]
         elif service == "ftp":
-            data = [("Login","uid"),
+            data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
-                    ("uid","uidNumber"),
+                    (("User ID"),"uidNumber"),
                     (_("Group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"userPassword")]
             if fields == "short":
-                delData = ["uid", _("Password"), _("Group")]
+                delData = [_("User ID"), _("Password"), _("Group")]
         return (data, delData)
 
     def getAllUsers(self, fields, service):