diff -r 2b8154cc7ebe -r fa22bd13b4d1 VirtualMailManager/VirtualMailManager.py --- a/VirtualMailManager/VirtualMailManager.py Sat Aug 22 20:24:50 2009 +0000 +++ b/VirtualMailManager/VirtualMailManager.py Sun Aug 23 17:08:18 2009 +0000 @@ -517,10 +517,9 @@ ERR.INVALID_AGUMENT) if details == 'detailed': details = 'full' - warning = _(u"""\ -The keyword »detailed« is deprecated and will be removed in a future release. - Please use the keyword »full« to get full details.""") - self.__warnings.append(warning) + self.__warnings.append(_(u'\ +The keyword »detailed« is deprecated and will be removed in a future release.\n\ + Please use the keyword »full« to get full details.')) dom = self.__getDomain(domainname) dominfo = dom.getInfo() if dominfo['domainname'].startswith('xn--'): @@ -688,10 +687,22 @@ acc.modify('transport', transport) def userDisable(self, emailaddress, service=None): + if service == 'managesieve': + service = 'sieve' + self.__warnings.append(_(u'\ +The service name »managesieve« is deprecated and will be removed\n\ + in a future release.\n\ + Please use the service name »sieve« instead.')) acc = self.__getAccount(emailaddress) acc.disable(self.__Cfg.getint('misc', 'dovecotvers'), service) def userEnable(self, emailaddress, service=None): + if service == 'managesieve': + service = 'sieve' + self.__warnings.append(_(u'\ +The service name »managesieve« is deprecated and will be removed\n\ + in a future release.\n\ + Please use the service name »sieve« instead.')) acc = self.__getAccount(emailaddress) acc.enable(self.__Cfg.getint('misc', 'dovecotvers'), service)