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

pym/cl_ldap.py

@@ -10679,7 +10679,7 @@ with another option."))
                         else:
                             data.append(("", value))
                 else:
-                    data.append((attrName, "No"))
+                    data.append((attrName, _("No")))
         return (headers, data)
 
     def getGroup(self, groupName, service):
@@ -10730,7 +10730,7 @@ with another option."))
                         else:
                             data.append(("", value))
                 else:
-                    data.append((attrName, "No"))
+                    data.append((attrName, _("No")))
         return (headers, data)
 
 
@@ -10831,7 +10831,7 @@ with another option."))
                             else:
                                 data.append(("", value))
                 else:
-                    data.append((attrName, "No"))
+                    data.append((attrName, _("No")))
         return (headers, data)
 
     def getAllMachines(self, fields, service):
@@ -10871,7 +10871,7 @@ with another option."))
                                    and ",".join([x,y]) , ldapValue, "")
                     listAttr.append(value)
                 else:
-                    listAttr.append("No")
+                    listAttr.append(_("No"))
             machines.append(listAttr)
         return (headers, machines)
 
@@ -10906,7 +10906,7 @@ with another option."))
                                    and ",".join([x,y]) , ldapValue, "")
                     listAttr.append(value)
                 else:
-                    listAttr.append("No")
+                    listAttr.append(_("No"))
             groups.append(listAttr)
         return (headers, groups)
 
@@ -10939,10 +10939,10 @@ with another option."))
         data = []
         delData = []
         if service == "samba":
-            data = [(_("Login"),"uid"),
+            data = [(_("User ID"),"uidNumber"),
+                    (_("Login"),"uid"),
                     (_("Name"),"cn"),
-                    (_("User ID"),"uidNumber"),
-                    (_("Group"),"gidNumber"),
+                    (_("Primary group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"sambaNTPassword"),
                     (_("Last change password"),"sambaPwdLastSet")]
@@ -10956,11 +10956,11 @@ with another option."))
         data = []
         delData = []
         if service == "unix":
-            data = [(_("Login"),"uid"),
+            data = [(_("User ID"),"uidNumber"),
+                    (_("Login"),"uid"),
                     (_("Name"),"cn"),
                     (_("Lock"),"shadowExpire"),
                     (_("Visible"),"shadowFlag"),
-                    (_("User ID"),"uidNumber"),
                     (_("Primary group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"userPassword"),
@@ -10990,16 +10990,17 @@ with another option."))
         elif service == "jabber":
             data = [(_("Login"),"uid"),
                     (_("Name"),"cn"),
-                    (_("Lock"),"initials"),
                     (_("Group"),"departmentNumber"),
+                    (_("Jabber ID"),"mail")
+                    (_("Lock"),"initials"),
                     (_("Password"),"userPassword"),
-                    (_("Jabber ID"),"mail")]
+                    ]
             if fields == "short":
                 delData = [_("Lock"), _("Group"), _("Password")]
         elif service == "ftp":
-            data = [(_("Login"),"uid"),
+            data = [(_("User ID"),"uidNumber"),
+                    (_("Login"),"uid"),
                     (_("Name"),"cn"),
-                    (_("User ID"),"uidNumber"),
                     (_("Primary group"),"gidNumber"),
                     (_("Home directory"),"homeDirectory"),
                     (_("Password"),"userPassword")]
@@ -11057,7 +11058,7 @@ with another option."))
                                    and ",".join([x,y]) , ldapValue, "")
                     listAttr.append(value)
                 else:
-                    listAttr.append("No")
+                    listAttr.append(_("No"))
             loginsUsers.append(listAttr)
         return (headers, loginsUsers)
 
@@ -11086,37 +11087,37 @@ with another option."))
             retValue = self._getUserGroupName(value, "unix")
         # Ставим Y в случае выставленного флага
         elif attr == "initials":
-            if value == "No":
-                retValue = "Yes"
+            if value == _("No"):
+                retValue = _("Yes")
             else:
-                retValue = "No"
+                retValue = _("No")
         elif attr == "accountStatus":
             if value == "passive":
-                retValue = "Yes"
+                retValue = _("Yes")
             else:
-                retValue = "No"
+                retValue = _("No")
         elif attr == "shadowExpire":
             if value == "1":
-                retValue = "Yes"
+                retValue = _("Yes")
             else:
-                retValue = "No"
+                retValue = _("No")
         elif attr == "sambaAcctFlags":
             if value == "[DU         ]":
-                retValue = "Yes"
+                retValue = _("Yes")
             else:
-                retValue = "No"
+                retValue = _("No")
         elif attr == "userPassword":
             if value == "crypt{xxx}":
-                retValue = "No"
+                retValue = _("No")
             else:
-                retValue = "Yes"
+                retValue = _("Yes")
         elif attr == "shadowFlag":
             if value == "1":
-                retValue = "Yes"
+                retValue = _("Yes")
             else:
-                retValue = "No"
+                retValue = _("No")
         elif attr == "sambaNTPassword":
-            retValue = "Yes"
+            retValue = _("Yes")
         return retValue
 
     def _convDatatoStr(self, dataDays):