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

pym/cl_ldap.py

@@ -1504,7 +1504,7 @@ class servUnix(shareLdap):
         if not flagError:
             # Востановим (home на сервере) удаленного пользователя
             message = _("Restored deleted user %s")% userName + "\n" +\
-                    _("(Y - yes, n - no, ctrl+c - cansel)")
+                    _("'yes', 'no'")
             resHomeDir = self.restorePathDelUser(userName, homeDir,
                                                     "unix/home", message, self)
             if not resHomeDir:
@@ -3065,7 +3065,7 @@ in Unix service ...") %str(primaryMail))
             mailDir = os.path.join(self.clVars.Get("sr_mail_path"),
                                 userName)
             message = _("Restored deleted user %s data")% userName + "\n" +\
-                        _("(Y - yes, n - no, ctrl+c - cansel)")
+                        _("'yes', 'no'")
 
             resMailDir = self.restorePathDelUser(userName, mailDir,
                                                     "mail/imap", message)
@@ -3109,9 +3109,7 @@ in Unix service ...") %str(primaryMail))
         #self.clVars.printVars()
         #return True
         if self.clVars.Get("sr_unix_set") != "on":
-            self.printERROR (_("ERROR") + ": " +\
-            _("LDAP server is not configured")+ ".")
-            self.printWARNING(_("Unix service is not setuped"))
+            self.printERROR(_("Unix service is not setuped"))
             self.printWARNING(_("Setup Unix service"))
             self.printWARNING("  cl-setup unix")
             return False
@@ -3723,9 +3721,7 @@ class servJabber(shareLdap):
         #self.clVars.printVars()
         #return True
         if self.clVars.Get("sr_ldap_set") != "on":
-            self.printERROR (_("ERROR") + ": " +\
-            _("LDAP server is not configured")+ ".")
-            self.printWARNING(_("LDAP service is not setuped"))
+            self.printERROR(_("LDAP service is not setuped"))
             self.printWARNING(_("Setup LDAP service"))
             self.printWARNING("  cl-setup ldap")
             return False
@@ -4036,7 +4032,7 @@ class servSamba(shareLdap):
                 os.path.join(self.clVars.Get("sr_samba_winlogon_path"),
                                          userName)
             message = _("Restored deleted user %s")% userName + "\n" +\
-                        _("(Y - yes, n - no, ctrl+c - cansel)")
+                        _("'yes', 'no'")
 
             resWinProf = self.restorePathDelUser(userName, winProfDir,
                                                  "samba/winprofile", message)
@@ -4205,9 +4201,7 @@ class servSamba(shareLdap):
         if options.has_key("f"):
             forceOptions = True
         if self.clVars.Get("sr_unix_set") != "on":
-            self.printERROR (_("ERROR") + ": " +\
-            _("LDAP server is not configured")+ ".")
-            self.printWARNING(_("Unix service is not setuped"))
+            self.printERROR(_("Unix service is not setuped"))
             self.printWARNING (_("Setup Unix service"))
             self.printWARNING("  cl-setup unix")
             return False