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

pym/cl_ldap.py

@@ -292,7 +292,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
             return True
         else:
             self.printError(_("ERROR") + ": " + execStr)
-            self.printError(_("Not added from default runlevel")+ " ...")
+            self.printError(_("Not added at default runlevel")+ " ...")
             return False
 
     def delDaemonAutostart(self, daemon):
@@ -887,7 +887,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
         # Применяем условия к профилю
         ldifProfile = clProf.applyTermsProfile(ldifProfile,ldifFile)
         # Заменяем переменные
-        ldifProfile = clProf.applyVarsProfile(ldifProfile,ldifFile)
+        ldifProfile = clProf.applyVarsProfile(ldifProfile)
         return ldifProfile
 
     def searchLineInFile(self, name, fileName, numEl=0):
@@ -2291,8 +2291,6 @@ service"))
             return True
         if not self.clVars.Get("sr_ldap_set") == "on":
             self.printERROR(_("LDAP service not setuped") +" ...")
-            self.printWARNING (_("Setup LDAP service"))
-            self.printWARNING("  cl-setup ldap")
             return False
         if not forceOptions:
             # предупреждение  при выполнении этой программы будут изменены
@@ -3460,8 +3458,8 @@ class servJabber(shareLdap):
                 break
             if not replaceFlag and\
                 userSearch[0][0][1].has_key('departmentNumber'):
-                self.printERROR(_("User %s is found in group %s")%\
-                                (str(userName),str(groupName)) + " ...")
+                self.printERROR(_("User %s is found in group")%\
+                     str(userName) + " " + str(groupName) + " ...")
                 flagFalse = True
                 break
         if flagFalse:
@@ -3488,8 +3486,8 @@ class servJabber(shareLdap):
             if userSearch[0][0][1].has_key('departmentNumber'):
                 if not userSearch[0][0][1]['departmentNumber'][0] == \
                 groupSearch[0][0][1]['cn'][0]:
-                    self.printERROR(_("User %s is not found in group %s")%\
-                                (str(userName),str(groupName)) + " ...")
+                    self.printERROR(_("User %s is not found in group")%\
+                        str(userName) + " " + str(groupName) + " ...")
                     res = False
                     break
             else:
@@ -3660,8 +3658,8 @@ class servJabber(shareLdap):
             if options.has_key('P') or options.has_key('p'):
                 self.printSUCCESS(_("Modified Jabber user password") + " ...")
         if options.has_key('i'):
-                self.printSUCCESS(_("Set image %s from Jabber user %s")\
-                %(str(options['i']), str(userName)) + " ...")
+                self.printSUCCESS(_("Set image %s for Jabber user")%\
+                   str(options['i']) + " " + str(userName) + " ...")
         return True
 
     def modGroupJabberServer(self, groupName, options):
@@ -5640,7 +5638,7 @@ preferences and data (for users with uid<1000)")
          'longOption':"image",
          'optVal':_("IMAGE"),
          'helpChapter':_("Jabber service options"),
-         'help':_("set the jpeg image photo from user (file)")
+         'help':_("set the jpeg image photo for user (file)")
         },
         {'progAccess':(5,),
          'shortOption':"G",